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# 873683 : "Build0270: undefined method in registration.rb in get_addon_list" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-04-14 17:50:43.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-04-17 10:31:50.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Apr 15 16:47:27 UTC 2014 - lslezak@suse.cz + +- fixed using nil base product when registration failed + (bnc#873683) +- register the base product again if it failed +- 3.1.35 + +------------------------------------------------------------------- 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:36475 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.34.tar.bz2 New: ---- yast2-registration-3.1.35.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.Urgsjo/_old 2014-04-17 14:20:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Urgsjo/_new 2014-04-17 14:20:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.34 +Version: 3.1.35 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.34.tar.bz2 -> yast2-registration-3.1.35.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.34/package/yast2-registration.changes new/yast2-registration-3.1.35/package/yast2-registration.changes --- old/yast2-registration-3.1.34/package/yast2-registration.changes 2014-04-14 16:18:31.000000000 +0200 +++ new/yast2-registration-3.1.35/package/yast2-registration.changes 2014-04-17 10:28:27.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Apr 15 16:47:27 UTC 2014 - lslezak@suse.cz + +- fixed using nil base product when registration failed + (bnc#873683) +- register the base product again if it failed +- 3.1.35 + +------------------------------------------------------------------- Mon Apr 14 12:32:17 UTC 2014 - lslezak@suse.cz - pass also version and architecture when registering an addon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.34/package/yast2-registration.spec new/yast2-registration-3.1.35/package/yast2-registration.spec --- old/yast2-registration-3.1.34/package/yast2-registration.spec 2014-04-14 16:18:31.000000000 +0200 +++ new/yast2-registration-3.1.35/package/yast2-registration.spec 2014-04-17 10:28:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.34 +Version: 3.1.35 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.34/src/clients/inst_scc.rb new/yast2-registration-3.1.35/src/clients/inst_scc.rb --- old/yast2-registration-3.1.34/src/clients/inst_scc.rb 2014-04-14 16:18:31.000000000 +0200 +++ new/yast2-registration-3.1.35/src/clients/inst_scc.rb 2014-04-17 10:28:27.000000000 +0200 @@ -106,14 +106,19 @@ when :network ::Registration::Helpers::run_network_configuration when :next + options = ::Registration::Storage::InstallationOptions.instance + # do not re-register during installation - return :next if !Mode.normal && ::Registration::Registration.is_registered? + if !Mode.normal && ::Registration::Registration.is_registered? && + options.base_registered + + return :next + end email = UI.QueryWidget(:email, :Value) reg_code = UI.QueryWidget(:reg_code, :Value) # remember the entered values in case user goes back - options = ::Registration::Storage::InstallationOptions.instance options.email = email options.reg_code = reg_code @@ -124,26 +129,32 @@ @registration = ::Registration::Registration.new(url) ::Registration::SccHelpers.catch_registration_errors do - Popup.Feedback(_("Registering the System..."), - _("Contacting the SUSE Customer Center server")) do - - @registration.register(email, reg_code) - end - # then register the product(s) - base_product = ::Registration::SwMgmt.base_product_to_register - product_services = Popup.Feedback( - _("Registering Product..."), - _("Contacting the SUSE Customer Center server")) do + if !::Registration::Registration.is_registered? + Popup.Feedback(_("Registering the System..."), + _("Contacting the SUSE Customer Center server")) do - @registration.register_products([base_product]) + @registration.register(email, reg_code) + end end - # remember the base products for later (to get the respective addons) - ::Registration::Storage::BaseProduct.instance.product = base_product + if !options.base_registered + # then register the product(s) + base_product = ::Registration::SwMgmt.base_product_to_register + product_services = Popup.Feedback( + _("Registering Product..."), + _("Contacting the SUSE Customer Center server")) do + + @registration.register_products([base_product]) + end + + # remember the base products for later (to get the respective addons) + ::Registration::Storage::BaseProduct.instance.product = base_product + options.base_registered = true - # select repositories to use in installation (e.g. enable/disable Updates) - select_repositories(product_services) if Mode.installation + # select repositories to use in installation (e.g. enable/disable Updates) + select_repositories(product_services) if Mode.installation + end return :next end @@ -247,8 +258,8 @@ if options.install_updates.nil? options.install_updates = Popup.YesNo( _("Registration added some update repositories.\n\n" + - "Do you want to install the latest available\n" + - "on-line updates during installation?")) + "Do you want to install the latest available\n" + + "on-line updates during installation?")) end ::Registration::SwMgmt.set_repos_state(updates, options.install_updates) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.34/src/lib/registration/storage.rb new/yast2-registration-3.1.35/src/lib/registration/storage.rb --- old/yast2-registration-3.1.34/src/lib/registration/storage.rb 2014-04-14 16:18:31.000000000 +0200 +++ new/yast2-registration-3.1.35/src/lib/registration/storage.rb 2014-04-17 10:28:27.000000000 +0200 @@ -43,12 +43,13 @@ class InstallationOptions include Singleton - attr_accessor :install_updates, :email, :reg_code, :selected_addons + attr_accessor :install_updates, :email, :reg_code, :selected_addons, :base_registered def initialize @email = "" @reg_code = "" @selected_addons = [] + @base_registered = false end end continue with "q"... Checked in at Thu Apr 17 14:20:32 CEST 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