[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# 868942 : ""use add-ons from media" checkbox does not work properly" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-03-18 13:07:53.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-03-20 15:46:56.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 19 14:28:56 UTC 2014 - lslezak@suse.cz + +- ask for media addons when the respective checkbox is set + (bnc#868942) +- 3.1.20 + +------------------------------------------------------------------- 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:34651 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.19.tar.bz2 New: ---- yast2-registration-3.1.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.cyWwU3/_old 2014-03-21 15:22:33.000000000 +0100 +++ /var/tmp/diff_new_pack.cyWwU3/_new 2014-03-21 15:22:33.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.19 +Version: 3.1.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.19.tar.bz2 -> yast2-registration-3.1.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.19/package/yast2-registration.changes new/yast2-registration-3.1.20/package/yast2-registration.changes --- old/yast2-registration-3.1.19/package/yast2-registration.changes 2014-03-18 10:44:23.000000000 +0100 +++ new/yast2-registration-3.1.20/package/yast2-registration.changes 2014-03-20 15:44:17.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 19 14:28:56 UTC 2014 - lslezak@suse.cz + +- ask for media addons when the respective checkbox is set + (bnc#868942) +- 3.1.20 + +------------------------------------------------------------------- Tue Mar 18 09:31:39 UTC 2014 - lslezak@suse.cz - Display and allow registering online add-ons from SCC during diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.19/package/yast2-registration.spec new/yast2-registration-3.1.20/package/yast2-registration.spec --- old/yast2-registration-3.1.19/package/yast2-registration.spec 2014-03-18 10:44:23.000000000 +0100 +++ new/yast2-registration-3.1.20/package/yast2-registration.spec 2014-03-20 15:44:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.19 +Version: 3.1.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.19/src/clients/inst_scc.rb new/yast2-registration-3.1.20/src/clients/inst_scc.rb --- old/yast2-registration-3.1.19/src/clients/inst_scc.rb 2014-03-18 10:44:23.000000000 +0100 +++ new/yast2-registration-3.1.20/src/clients/inst_scc.rb 2014-03-20 15:44:18.000000000 +0100 @@ -54,6 +54,7 @@ Yast.import "Label" Yast.import "Sequencer" Yast.import "Installation" + Yast.import "ProductControl" # redirect the scc_api log to y2log SccApi::GlobalLogger.instance.log = Y2Logger.instance @@ -478,7 +479,7 @@ handle_addon_selection_dialog(addons) end - + # create widgets for entering the addon reg keys def addon_regkey_items(addons) textmode = UI.TextMode @@ -655,12 +656,22 @@ Popup.YesNo(confirmation) end + def media_addons + if Installation.add_on_selected + # start the next step (add-on media selection) + ProductControl.RunFrom(ProductControl.CurrentStep + 1, false) + else + :next + end + end + # UI workflow definition def start_workflow aliases = { "register" => lambda { register_base_system() }, "select_addons" => lambda { select_addons() }, - "register_addons" => lambda { register_addons() } + "register_addons" => lambda { register_addons() }, + "media_addons" => lambda { media_addons() } } sequence = { @@ -672,11 +683,15 @@ }, "select_addons" => { :abort => :abort, - :skip => :next, + :skip => "media_addons", :next => "register_addons" }, "register_addons" => { :abort => :abort, + :next => "media_addons" + }, + "media_addons" => { + :abort => :abort, :next => :next } } continue with "q"... Checked in at Fri Mar 21 15:22:42 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