[yast-commit] [ci_new_pac] JFYI yast2-registration -> sle12
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-registration -> sle12 ## BNC# 868830 : "Registration during installation not working due to missing network setup" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-03-21 15:22:42.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-03-24 09:07:26.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 20 14:55:07 UTC 2014 - lslezak@suse.cz + +- added "Network Configuration" button for manual network + configuration, ask user to configure network if registration + fails because of missing network setup (bnc#868830) +- 3.1.21 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-registration ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-registration (Old) and /mounts/work_src_done/SLE12/yast2-registration (BS:build ID:34708 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.20.tar.bz2 New: ---- yast2-registration-3.1.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.KLr8cl/_old 2014-03-24 16:56:00.000000000 +0100 +++ /var/tmp/diff_new_pack.KLr8cl/_new 2014-03-24 16:56:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.20 +Version: 3.1.21 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.20.tar.bz2 -> yast2-registration-3.1.21.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.20/package/yast2-registration.changes new/yast2-registration-3.1.21/package/yast2-registration.changes --- old/yast2-registration-3.1.20/package/yast2-registration.changes 2014-03-20 15:44:17.000000000 +0100 +++ new/yast2-registration-3.1.21/package/yast2-registration.changes 2014-03-24 09:01:24.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Mar 20 14:55:07 UTC 2014 - lslezak@suse.cz + +- added "Network Configuration" button for manual network + configuration, ask user to configure network if registration + fails because of missing network setup (bnc#868830) +- 3.1.21 + +------------------------------------------------------------------- Wed Mar 19 14:28:56 UTC 2014 - lslezak@suse.cz - ask for media addons when the respective checkbox is set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.20/package/yast2-registration.spec new/yast2-registration-3.1.21/package/yast2-registration.spec --- old/yast2-registration-3.1.20/package/yast2-registration.spec 2014-03-20 15:44:17.000000000 +0100 +++ new/yast2-registration-3.1.21/package/yast2-registration.spec 2014-03-24 09:01:24.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.20 +Version: 3.1.21 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.20/src/clients/inst_scc.rb new/yast2-registration-3.1.21/src/clients/inst_scc.rb --- old/yast2-registration-3.1.20/src/clients/inst_scc.rb 2014-03-20 15:44:18.000000000 +0100 +++ new/yast2-registration-3.1.21/src/clients/inst_scc.rb 2014-03-24 09:01:24.000000000 +0100 @@ -92,6 +92,11 @@ ::Registration::Storage::RegKeys.instance.reg_keys = @known_reg_keys end + def run_network_configuration + log.info "Running network configuration..." + WFM.call("inst_lan") + end + def register_base_system show_scc_credentials_dialog @@ -101,8 +106,10 @@ while !continue_buttons.include?(ret) do ret = UI.UserInput - if ret == :next - + case ret + when :network + run_network_configuration + when :next email = UI.QueryWidget(:email, :Value) reg_code = UI.QueryWidget(:reg_code, :Value) # reset the user input in case an exception is raised @@ -112,7 +119,6 @@ register(email, reg_code) return :next end - end return ret if ret == :skip && confirm_skipping @@ -126,7 +132,10 @@ yield rescue SccApi::NoNetworkError # Error popup - Report.Error(_("Network is not configured, the registration server cannot be reached.")) + if Popup.YesNo(_("Network is not configured, the registration server cannot be reached.\n" + + "Do you want to configure the network now?") ) + run_network_configuration + end rescue SccApi::NotAuthorized # Error popup Report.Error(_("The email address or the registration\ncode is not valid.")) @@ -226,6 +235,10 @@ # content for the main registration dialog def scc_credentials_dialog VBox( + Mode.installation ? + Right(PushButton(Id(:network), _("Network Configuration..."))) : + Empty(), + VStretch(), HBox( HSpacing(Opt(:hstretch), 3), Frame(_("SUSE Customer Center Credentials"), @@ -240,7 +253,8 @@ HSpacing(Opt(:hstretch), 3), ), VSpacing(3), - PushButton(Id(:skip), _("&Skip Registration")) + PushButton(Id(:skip), _("&Skip Registration")), + VStretch() ) end continue with "q"... Checked in at Mon Mar 24 16:56:06 CET 2014 by ro 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)
-
ro