Script 'mail_helper' called by kukuk Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: kukuk. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-registration -> sle12 ## BNC# 877365 : "After installation is restarted after an abort, registration isn't possible anymore" (RESOLVED/FIXED) ## BNC# 880507 : "Declining a license of extension brings me to "Add On Product" dialog" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-06-12 14:37:05.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-06-13 07:38:50.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Jun 12 13:48:59 UTC 2014 - lslezak@suse.cz + +- reset registration status when installation is restarted + (bnc#877365) +- 3.1.74 + +------------------------------------------------------------------- +Thu Jun 12 07:28:51 UTC 2014 - lslezak@suse.cz + +- removed media addons from registratoin workflow (bnc#880507) +- 3.1.73 + +------------------------------------------------------------------- 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:39489 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.72.tar.bz2 New: ---- yast2-registration-3.1.74.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.xPh1Oe/_old 2014-06-13 16:15:13.000000000 +0200 +++ /var/tmp/diff_new_pack.xPh1Oe/_new 2014-06-13 16:15:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.72 +Version: 3.1.74 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.72.tar.bz2 -> yast2-registration-3.1.74.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.72/package/yast2-registration.changes new/yast2-registration-3.1.74/package/yast2-registration.changes --- old/yast2-registration-3.1.72/package/yast2-registration.changes 2014-06-11 16:21:21.000000000 +0200 +++ new/yast2-registration-3.1.74/package/yast2-registration.changes 2014-06-13 15:31:19.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Jun 12 13:48:59 UTC 2014 - lslezak@suse.cz + +- reset registration status when installation is restarted + (bnc#877365) +- 3.1.74 + +------------------------------------------------------------------- +Thu Jun 12 07:28:51 UTC 2014 - lslezak@suse.cz + +- removed media addons from registratoin workflow (bnc#880507) +- 3.1.73 + +------------------------------------------------------------------- Tue Jun 11 14:22:07 UTC 2014 - jreidinger@suse.com - write changes at the end of installation for suse connect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.72/package/yast2-registration.spec new/yast2-registration-3.1.74/package/yast2-registration.spec --- old/yast2-registration-3.1.72/package/yast2-registration.spec 2014-06-11 16:21:21.000000000 +0200 +++ new/yast2-registration-3.1.74/package/yast2-registration.spec 2014-06-13 15:31:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.72 +Version: 3.1.74 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.72/src/clients/inst_scc.rb new/yast2-registration-3.1.74/src/clients/inst_scc.rb --- old/yast2-registration-3.1.72/src/clients/inst_scc.rb 2014-06-11 16:21:21.000000000 +0200 +++ new/yast2-registration-3.1.74/src/clients/inst_scc.rb 2014-06-13 15:31:19.000000000 +0200 @@ -63,12 +63,15 @@ Yast.import "Wizard" Yast.import "Report" Yast.import "Mode" + Yast.import "Stage" Yast.import "Label" Yast.import "Sequencer" Yast.import "Installation" Yast.import "ProductControl" Yast.import "SourceDialogs" + first_run + @selected_addons = ::Registration::Storage::InstallationOptions.instance.selected_addons initialize_regcodes @@ -529,21 +532,6 @@ Popup.YesNo(confirmation) end - def media_addons - # force displaying the UI - Installation.add_on_selected = true - - ret = WFM.call("inst_add-on", - [{ "enable_next" => true, "enable_back" => true}] - ) - ret = :next if [:auto, :finish].include?(ret) - - # leave the workflow if registration was skipped - ret = :finish if ret == :next && @registration_skipped - - return ret - end - def registered_dialog VBox( Heading(_("The system is already registered.")), @@ -625,7 +613,6 @@ "register" => lambda { register_base_system() }, "select_addons" => lambda { select_addons() }, "update" => [ lambda { update_registration() }, true ], - "media_addons" => lambda { media_addons() }, "addon_eula" => lambda { addon_eula() }, "register_addons" => lambda { register_addons() } } @@ -650,18 +637,13 @@ "register" => { :abort => :abort, :cancel => :abort, - :skip => "media_addons", + :skip => :next, :next => "select_addons" }, "select_addons" => { :abort => :abort, - :skip => "media_addons", - :next => "media_addons" - }, - "media_addons" => { - :abort => :abort, - :next => "addon_eula", - :finish => :next + :skip => :next, + :next => "addon_eula" }, "addon_eula" => { :abort => :abort, @@ -689,6 +671,18 @@ Registration::Addon.registered end + def first_run + if ::Registration::Storage::Cache.instance.first_run + ::Registration::Storage::Cache.instance.first_run = false + + if Stage.initial && ::Registration::Registration.is_registered? + file = ::Registration::Registration::SCC_CREDENTIALS + log.info "Resetting registration status, removing #{file}" + File.rm(file) + end + end + end + end unless defined?(InstSccClient) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.72/src/lib/registration/storage.rb new/yast2-registration-3.1.74/src/lib/registration/storage.rb --- old/yast2-registration-3.1.72/src/lib/registration/storage.rb 2014-06-11 16:21:21.000000000 +0200 +++ new/yast2-registration-3.1.74/src/lib/registration/storage.rb 2014-06-13 15:31:20.000000000 +0200 @@ -48,7 +48,7 @@ end end - class Cache < Struct.new(:available_addons, :registered_addons, + class Cache < Struct.new(:available_addons, :first_run, :registered_addons, :reg_url, :reg_url_cached) include Singleton @@ -56,6 +56,7 @@ def initialize # TODO: handle registered addons in installed system self.registered_addons = [] + self.first_run = true end end continue with "q"... Checked in at Fri Jun 13 16:15:39 CEST 2014 by kukuk Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org