[yast-commit] [ci_new_pac] JFYI yast2-network -> sle12
Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12 ## BNC# 878719 : ""Internal error" when all NetworkManager packages are uninstalled - SLES12" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-06-06 17:21:52.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-06-11 14:19:48.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jun 11 10:06:12 UTC 2014 - mfilka@suse.com + +- bnc#878719 + - handle inactive network service state + - allow disabling network service completely +- fixed disabling of unconfigureable items when e.g. NetworkManager + is used as network service +- 3.1.63 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-network - at least 15 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old) and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:39302 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-network-3.1.62.tar.bz2 New: ---- yast2-network-3.1.63.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.49SO1i/_old 2014-06-11 15:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.49SO1i/_new 2014-06-11 15:29:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.62 +Version: 3.1.63 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.62.tar.bz2 -> yast2-network-3.1.63.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.62/package/yast2-network.changes new/yast2-network-3.1.63/package/yast2-network.changes --- old/yast2-network-3.1.62/package/yast2-network.changes 2014-06-04 10:56:27.000000000 +0200 +++ new/yast2-network-3.1.63/package/yast2-network.changes 2014-06-11 14:16:13.000000000 +0200 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Jun 11 10:06:12 UTC 2014 - mfilka@suse.com + +- bnc#878719 + - handle inactive network service state + - allow disabling network service completely +- fixed disabling of unconfigureable items when e.g. NetworkManager + is used as network service +- 3.1.63 + +------------------------------------------------------------------- Tue Jun 3 20:37:11 UTC 2014 - mfilka@suse.com - bnc#858908 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.62/package/yast2-network.spec new/yast2-network-3.1.63/package/yast2-network.spec --- old/yast2-network-3.1.62/package/yast2-network.spec 2014-06-04 10:56:27.000000000 +0200 +++ new/yast2-network-3.1.63/package/yast2-network.spec 2014-06-11 14:16:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.62 +Version: 3.1.63 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.62/src/include/network/lan/complex.rb new/yast2-network-3.1.63/src/include/network/lan/complex.rb --- old/yast2-network-3.1.62/src/include/network/lan/complex.rb 2014-06-04 10:56:27.000000000 +0200 +++ new/yast2-network-3.1.63/src/include/network/lan/complex.rb 2014-06-11 14:16:13.000000000 +0200 @@ -1,4 +1,4 @@ -# encoding: utf-8 +#, :gw6dev encoding: utf-8 #*************************************************************************** # @@ -360,7 +360,7 @@ UI.ChangeWidget(Id(:_hw_items), :Items, term_items) if !@shown - disableItemsIfNM([:_hw_items, :_hw_sum] + overview_buttons.keys, true) + disable_unconfigureable_items([:_hw_items, :_hw_sum] + overview_buttons.keys, true) @shown = true else enableDisableButtons @@ -372,8 +372,7 @@ end def handleOverview(key, event) - event = deep_copy(event) - if !disableItemsIfNM([:_hw_items, :_hw_sum] + overview_buttons.keys, false) + if !disable_unconfigureable_items([:_hw_items, :_hw_sum] + overview_buttons.keys, false) enableDisableButtons end UI.ChangeWidget(:_hw_sum, :Value, LanItems.GetItemDescription) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.62/src/include/network/lan/dhcp.rb new/yast2-network-3.1.63/src/include/network/lan/dhcp.rb --- old/yast2-network-3.1.62/src/include/network/lan/dhcp.rb 2014-06-04 10:56:27.000000000 +0200 +++ new/yast2-network-3.1.63/src/include/network/lan/dhcp.rb 2014-06-11 14:16:13.000000000 +0200 @@ -116,7 +116,7 @@ Ops.get_boolean(NetworkConfig.DHCP, "DHCLIENT_SET_DEFAULT_ROUTE", true) ) - disableItemsIfNM( + disable_unconfigureable_items( [:broadcast, :clientid, :hostname, :no_defaultroute], false ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.62/src/include/network/routines.rb new/yast2-network-3.1.63/src/include/network/routines.rb --- old/yast2-network-3.1.62/src/include/network/routines.rb 2014-06-04 10:56:27.000000000 +0200 +++ new/yast2-network-3.1.63/src/include/network/routines.rb 2014-06-11 14:16:13.000000000 +0200 @@ -1086,31 +1086,36 @@ end - # Check if we're running in "normal" stage with NM + def unconfigureable_service? + return true if Mode.normal && NetworkService.is_network_manager + return true if NetworkService.is_disabled + + return false + end + + # Disables all widgets which cannot be configured with current network service + # # see bnc#433084 # if listed any items, disable them, if show_popup, show warning popup + # + # returns true if items were disabled + def disable_unconfigureable_items(items, show_popup) + return false if !unconfigureable_service? - def disableItemsIfNM(items, show_popup) - items = deep_copy(items) - disable = true - if Mode.normal && NetworkService.is_network_manager - Builtins.foreach(items) { |w| UI.ChangeWidget(Id(w), :Enabled, false) } - if show_popup - Popup.Warning( - _( - "Network is currently controlled by NetworkManager and its settings \n" + - "cannot be edited by YaST.\n" + - "\n" + - "To edit the settings, use the NetworkManager connection editor or\n" + - "switch the network setup method to Traditional with ifup.\n" - ) + items.each { |i| UI.ChangeWidget(Id(i), :Enabled, false) } + + if show_popup + Popup.Warning( + _( + "Network is currently handled by an unsupported network service\n" + + "or completely disabled. YaST is unable to configure some options." ) - UI.FakeUserInput({ "ID" => "global" }) - end - else - disable = false + ) + UI.FakeUserInput({ "ID" => "global" }) end - disable + + return true end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.62/src/include/network/services/dns.rb new/yast2-network-3.1.63/src/include/network/services/dns.rb --- old/yast2-network-3.1.62/src/include/network/services/dns.rb 2014-06-04 10:56:27.000000000 +0200 +++ new/yast2-network-3.1.63/src/include/network/services/dns.rb 2014-06-11 14:16:13.000000000 +0200 @@ -573,7 +573,7 @@ UI.ChangeWidget(Id("PLAIN_POLICY"), :Enabled, false) end #then disable if needed - disableItemsIfNM(["PLAIN_POLICY"], false) + disable_unconfigureable_items(["PLAIN_POLICY"], false) nil end @@ -612,7 +612,7 @@ UI.ChangeWidget(Id("MODIFY_RESOLV"), :Value, default) #then disable if needed - disableItemsIfNM(["MODIFY_RESOLV"], false) + disable_unconfigureable_items(["MODIFY_RESOLV"], false) nil end @@ -652,7 +652,7 @@ ) ) { |key2| InitHnWidget(key2) } #disable those if NM is in charge - disableItemsIfNM( + disable_unconfigureable_items( ["NAMESERVER_1", "NAMESERVER_2", "NAMESERVER_3", "SEARCHLIST_S"], false ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.62/src/include/network/services/routing.rb new/yast2-network-3.1.63/src/include/network/services/routing.rb --- old/yast2-network-3.1.62/src/include/network/services/routing.rb 2014-06-04 10:56:27.000000000 +0200 +++ new/yast2-network-3.1.63/src/include/network/services/routing.rb 2014-06-11 14:16:13.000000000 +0200 @@ -329,7 +329,10 @@ UI.ChangeWidget(Id(:table), :Enabled, enabled) UI.ChangeWidget(Id(:forward_v4), :Enabled, enabled) UI.ChangeWidget(Id(:forward_v6), :Enabled, enabled) - disableItemsIfNM([:gw, :table, :add, :edit, :delete], false) + disable_unconfigureable_items( + [:gw, :gw6, :gw6dev, :table, :add, :edit, :delete], + false + ) if !Lan.ipv6 UI.ChangeWidget(Id(:gw6), :Enabled, false) UI.ChangeWidget(Id(:gw6dev), :Enabled, false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.62/src/include/network/widgets.rb new/yast2-network-3.1.63/src/include/network/widgets.rb --- old/yast2-network-3.1.62/src/include/network/widgets.rb 2014-06-04 10:56:27.000000000 +0200 +++ new/yast2-network-3.1.63/src/include/network/widgets.rb 2014-06-11 14:16:13.000000000 +0200 @@ -292,12 +292,14 @@ # @param [String] key id of the widget def ManagedInit(key) items = [] + any_service_active = false + if NetworkService.is_backend_available(:network_manager) items << Item( Id("managed"), # the user can control the network with the NetworkManager program _("NetworkManager Service"), - NetworkService.is_network_manager + any_service_active = NetworkService.is_network_manager ) end if NetworkService.is_backend_available(:netconfig) @@ -305,7 +307,7 @@ Id("ifup"), # ifup is a program name _("Traditional ifup"), - NetworkService.is_netconfig + any_service_active = NetworkService.is_netconfig ) end if NetworkService.is_backend_available(:wicked) @@ -313,10 +315,17 @@ Id("wicked"), # wicked is network configuration backend like netconfig _("Wicked Service"), - NetworkService.is_wicked + any_service_active = NetworkService.is_wicked ) end + items << Item( + Id("disabled"), + # used when no network service is active or to disable network service + _("Network Services Disabled"), + !any_service_active + ) + UI.ChangeWidget(Id(:managed), :Items, items) nil @@ -335,6 +344,8 @@ NetworkService.use_network_manager when "wicked" NetworkService.use_wicked + else + NetworkService.disable end if NetworkService.Modified continue with "q"... Checked in at Wed Jun 11 15:30:12 CEST 2014 by bg Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
bg