Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2013-11-21 15:26:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2013-11-19 10:49:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2013-11-21 15:26:52.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 20 08:50:16 UTC 2013 - [email protected] + +- removed automatic 2nd stage support (the 2nd stage has been + dropped completely) (FATE#314695) +- 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.6.tar.bz2 New: ---- yast2-network-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.AeStFt/_old 2013-11-21 15:26:53.000000000 +0100 +++ /var/tmp/diff_new_pack.AeStFt/_new 2013-11-21 15:26:53.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.6.tar.bz2 -> yast2-network-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.6/VERSION new/yast2-network-3.1.7/VERSION --- old/yast2-network-3.1.6/VERSION 2013-11-18 14:22:01.000000000 +0100 +++ new/yast2-network-3.1.7/VERSION 2013-11-20 10:58:44.000000000 +0100 @@ -1 +1 @@ -3.1.6 +3.1.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.6/package/yast2-network.changes new/yast2-network-3.1.7/package/yast2-network.changes --- old/yast2-network-3.1.6/package/yast2-network.changes 2013-11-18 14:22:01.000000000 +0100 +++ new/yast2-network-3.1.7/package/yast2-network.changes 2013-11-20 10:58:44.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 20 08:50:16 UTC 2013 - [email protected] + +- removed automatic 2nd stage support (the 2nd stage has been + dropped completely) (FATE#314695) +- 3.1.7 + +------------------------------------------------------------------- Mon Nov 18 10:26:50 UTC 2013 - [email protected] - Fix testsuite to the latest changes in NetworkInterfaces diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.6/package/yast2-network.spec new/yast2-network-3.1.7/package/yast2-network.spec --- old/yast2-network-3.1.6/package/yast2-network.spec 2013-11-18 14:22:01.000000000 +0100 +++ new/yast2-network-3.1.7/package/yast2-network.spec 2013-11-20 10:58:44.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.6/src/clients/dsl_proposal.rb new/yast2-network-3.1.7/src/clients/dsl_proposal.rb --- old/yast2-network-3.1.6/src/clients/dsl_proposal.rb 2013-11-18 14:22:01.000000000 +0100 +++ new/yast2-network-3.1.7/src/clients/dsl_proposal.rb 2013-11-20 10:58:44.000000000 +0100 @@ -41,7 +41,6 @@ Yast.import "DSL" Yast.import "Popup" Yast.import "Progress" - Yast.import "GetInstArgs" Yast.include self, "network/routines.rb" @@ -58,15 +57,16 @@ if @force_reset || !DSL.proposal_valid DSL.proposal_valid = true - if !GetInstArgs.automatic_configuration - # Popup text - BusyPopup(_("Detecting DSL devices...")) - end + + # Popup text + BusyPopup(_("Detecting DSL devices...")) + @progress_orig = Progress.set(false) DSL.Read DSL.Propose Progress.set(@progress_orig) - BusyPopupClose() if !GetInstArgs.automatic_configuration + + BusyPopupClose() end @sum = DSL.Summary(false) @proposal = Ops.get_string(@sum, 0, "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.6/src/clients/inst_hostname.rb new/yast2-network-3.1.7/src/clients/inst_hostname.rb --- old/yast2-network-3.1.6/src/clients/inst_hostname.rb 2013-11-18 14:22:01.000000000 +0100 +++ new/yast2-network-3.1.7/src/clients/inst_hostname.rb 2013-11-20 10:58:44.000000000 +0100 @@ -35,7 +35,6 @@ Yast.import "Arch" Yast.import "DNS" - Yast.import "GetInstArgs" Yast.import "Host" Yast.import "NetworkConfig" Yast.import "String" @@ -45,11 +44,6 @@ Yast.include self, "network/services/dns.rb" - - # Called backwards - #if(GetInstArgs::going_back()) - # return `auto; - # only once, do not re-propose if user gets back to this dialog from # the previous screen - bnc#438124 if !DNS.proposal_valid @@ -63,13 +57,8 @@ DNS.write_hostname = DNS.DefaultWriteHostname end - @ret = :next - - #No need for interactive UI in automatic configuration - if !GetInstArgs.automatic_configuration - Wizard.SetDesktopIcon("dns") - @ret = HostnameDialog() - end + Wizard.SetDesktopIcon("dns") + @ret = HostnameDialog() if @ret == :next Host.Read diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.6/src/clients/isdn_proposal.rb new/yast2-network-3.1.7/src/clients/isdn_proposal.rb --- old/yast2-network-3.1.6/src/clients/isdn_proposal.rb 2013-11-18 14:22:01.000000000 +0100 +++ new/yast2-network-3.1.7/src/clients/isdn_proposal.rb 2013-11-20 10:58:44.000000000 +0100 @@ -40,7 +40,6 @@ Yast.import "ISDN" Yast.import "Progress" - Yast.import "GetInstArgs" Yast.include self, "network/routines.rb" @@ -57,15 +56,16 @@ if @force_reset || !ISDN.proposal_valid ISDN.proposal_valid = true - if !GetInstArgs.automatic_configuration - # Popup text - BusyPopup(_("Detecting ISDN cards...")) - end + + # Popup text + BusyPopup(_("Detecting ISDN cards...")) + @progress_orig = Progress.set(false) ISDN.Read # no ISDN::Propose () ? Progress.set(@progress_orig) - BusyPopupClose() if !GetInstArgs.automatic_configuration + + BusyPopupClose() end @sum = ISDN.Summary(false) @proposal = Ops.get_string(@sum, 0, "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.6/src/clients/lan_proposal.rb new/yast2-network-3.1.7/src/clients/lan_proposal.rb --- old/yast2-network-3.1.6/src/clients/lan_proposal.rb 2013-11-18 14:22:01.000000000 +0100 +++ new/yast2-network-3.1.7/src/clients/lan_proposal.rb 2013-11-20 10:58:44.000000000 +0100 @@ -44,7 +44,6 @@ Yast.import "Popup" Yast.import "Progress" Yast.import "LanItems" - Yast.import "GetInstArgs" Yast.include self, "network/lan/wizards.rb" @@ -54,11 +53,7 @@ # # WFM::CallFunction( <proposal>, [<client function>, <map of arguments>]) # - # particularly for AutomaticConfiguration: - # - # WFM::CallFunction( <proposal>, ["MakeProposal", $[ "AutomaticConfiguration":true ]]) - # - # see inst_proposal.ycp and inst_automatic_configuration.ycp + # see inst_proposal.ycp @func = Ops.get_string(@args, 0, "") @param = Ops.get_map(@args, 1, {}) @@ -70,15 +65,8 @@ @warning = nil @warning_level = nil @force_reset = Ops.get_boolean(@param, "force_reset", false) - @automatic_configuration = GetInstArgs.automatic_configuration - - Lan.automatic_configuration = @automatic_configuration Builtins.y2milestone( - "lan_proposal/MakeProposal automatic_configuration: %1", - @automatic_configuration - ) - Builtins.y2milestone( "lan_proposal/MakeProposal force_reset: %1", @force_reset ) @@ -86,9 +74,7 @@ if @force_reset || !LanItems.proposal_valid LanItems.proposal_valid = true - if !@automatic_configuration - BusyPopup(_("Detecting network cards...")) - end + BusyPopup(_("Detecting network cards...")) @progress_orig = Progress.set(false) @@ -103,7 +89,7 @@ Lan.Propose Progress.set(@progress_orig) - BusyPopupClose() if !@automatic_configuration + BusyPopupClose() end @sum = Lan.Summary("proposal") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.6/src/clients/modem_proposal.rb new/yast2-network-3.1.7/src/clients/modem_proposal.rb --- old/yast2-network-3.1.6/src/clients/modem_proposal.rb 2013-11-18 14:22:01.000000000 +0100 +++ new/yast2-network-3.1.7/src/clients/modem_proposal.rb 2013-11-20 10:58:44.000000000 +0100 @@ -41,7 +41,6 @@ Yast.import "Modem" Yast.import "Popup" Yast.import "Progress" - Yast.import "GetInstArgs" Yast.include self, "network/routines.rb" @@ -58,18 +57,16 @@ if @force_reset || !Modem.proposal_valid Modem.proposal_valid = true - if !GetInstArgs.automatic_configuration - # Popup text - BusyPopup(_("Detecting modems...")) - end + + # Popup text + BusyPopup(_("Detecting modems...")) @progress_orig = Progress.set(false) Modem.Read # no Modem::Propose () ? - if !GetInstArgs.automatic_configuration - Progress.set(@progress_orig) - BusyPopupClose() - end + + Progress.set(@progress_orig) + BusyPopupClose() end @sum = Modem.Summary(false) @proposal = Ops.get_string(@sum, 0, "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.6/src/modules/Lan.rb new/yast2-network-3.1.7/src/modules/Lan.rb --- old/yast2-network-3.1.6/src/modules/Lan.rb 2013-11-18 14:22:01.000000000 +0100 +++ new/yast2-network-3.1.7/src/modules/Lan.rb 2013-11-20 10:58:44.000000000 +0100 @@ -86,11 +86,6 @@ # are applied at once, like during the normal installation. #128810, #168806 # boolean start_immediately = false; - # boolean if we do automatic installation in second stage - - @automatic_configuration = false - - # ipv6 module @ipv6 = true @@ -757,13 +752,8 @@ Builtins.sleep(1000) timeout = Ops.subtract(timeout, 1) end - if !network - if @automatic_configuration - Builtins.y2error("No network running") - else - Popup.Error(_("No network running")) - end - end + + Popup.Error(_("No network running")) unless network end # Final progress step @@ -1566,7 +1556,6 @@ end publish :variable => :virt_net_proposal, :type => "boolean" - publish :variable => :automatic_configuration, :type => "boolean" publish :variable => :ipv6, :type => "boolean" publish :variable => :AbortFunction, :type => "block <boolean>" publish :variable => :bond_autoconf_slaves, :type => "list <string>" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
