![](https://seccdn.libravatar.org/avatar/c832a8d3457e1cacf4f28b56b637136d.jpg?s=120&d=mm&r=g)
Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-registration -> sle12 ## BNC# 893462 : "nil:NilClass error caused by clicking Cancel button in "Local Registration Servers" window" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-08-26 15:45:37.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-08-27 08:43:50.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 26 18:34:07 UTC 2014 - ancor@suse.com + +- Added proper handling for the user clicking the cancel button in + "Local Registration Servers" window (bnc#893462) +- 3.1.111 + +------------------------------------------------------------------- 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:43160 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.110.tar.bz2 New: ---- yast2-registration-3.1.111.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.TL2hSI/_old 2014-08-27 16:12:47.000000000 +0200 +++ /var/tmp/diff_new_pack.TL2hSI/_new 2014-08-27 16:12:47.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.110 +Version: 3.1.111 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.110.tar.bz2 -> yast2-registration-3.1.111.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.110/package/yast2-registration.changes new/yast2-registration-3.1.111/package/yast2-registration.changes --- old/yast2-registration-3.1.110/package/yast2-registration.changes 2014-08-26 14:24:31.000000000 +0200 +++ new/yast2-registration-3.1.111/package/yast2-registration.changes 2014-08-27 08:39:31.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 26 18:34:07 UTC 2014 - ancor@suse.com + +- Added proper handling for the user clicking the cancel button in + "Local Registration Servers" window (bnc#893462) +- 3.1.111 + +------------------------------------------------------------------- Tue Aug 26 12:03:39 UTC 2014 - ancor@suse.com - Replaced call to private method SslCertificate#sha256_fingerprint diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.110/package/yast2-registration.spec new/yast2-registration-3.1.111/package/yast2-registration.spec --- old/yast2-registration-3.1.110/package/yast2-registration.spec 2014-08-26 14:24:31.000000000 +0200 +++ new/yast2-registration-3.1.111/package/yast2-registration.spec 2014-08-27 08:39:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.110 +Version: 3.1.111 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.110/src/clients/inst_scc.rb new/yast2-registration-3.1.111/src/clients/inst_scc.rb --- old/yast2-registration-3.1.110/src/clients/inst_scc.rb 2014-08-26 14:24:31.000000000 +0200 +++ new/yast2-registration-3.1.111/src/clients/inst_scc.rb 2014-08-27 08:39:31.000000000 +0200 @@ -197,7 +197,7 @@ end def refresh_base_product - init_registration + return false if init_registration == :cancel upgraded = ::Registration::ConnectHelpers.catch_registration_errors(show_update_hint: true) do # then register the product(s) @@ -225,6 +225,13 @@ def refresh_addons addons = get_available_addons + if addons == :cancel + # With the current code, this should never happen because + # #get_available_addons will not return :cancel if + # #refresh_base_product returned a positive value, but + # it's better to stay safe and abort nicely. + return :cancel + end # find addon updates addons_to_update = ::Registration::SwMgmt.find_addon_updates(addons) @@ -386,7 +393,8 @@ # run the addon selection dialog def select_addons - get_available_addons # FIXME just to fill cache with popup + # FIXME get_available_addons is called just to fill cache with popup + return :cancel if get_available_addons == :cancel # FIXME workaround to reference between old way and new storage in Addon metaclass @selected_addons = Registration::Addon.selected @@ -401,7 +409,7 @@ # installation workflow def get_available_addons # cache the available addons - init_registration + return :cancel if init_registration == :cancel @available_addons = Popup.Feedback( _(CONTACTING_MESSAGE), @@ -419,7 +427,7 @@ # create duplicate as array is modified in loop for registration order registration_order = @selected_addons.clone - init_registration + return false if init_registration == :cancel product_succeed = registration_order.map do |product| ::Registration::ConnectHelpers.catch_registration_errors(message_prefix: "#{product.label}\n") do @@ -642,6 +650,7 @@ "select_addons" => { :abort => :abort, :skip => :next, + :cancel => "check", :next => "addon_eula" }, "addon_eula" => { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.110/src/lib/registration/url_helpers.rb new/yast2-registration-3.1.111/src/lib/registration/url_helpers.rb --- old/yast2-registration-3.1.110/src/lib/registration/url_helpers.rb 2014-08-26 14:24:32.000000000 +0200 +++ new/yast2-registration-3.1.111/src/lib/registration/url_helpers.rb 2014-08-27 08:39:31.000000000 +0200 @@ -53,7 +53,8 @@ # Evaluate the registration URL to use # @see https://github.com/yast/yast-registration/wiki/Changing-the-Registration-Ser... # for details - # @return [String,nil] registration URL, nil means use the default + # @return [String,nil,Symbol] registration URL, nil means use the default, + # :cancel means that the user aborted the selection def self.registration_url # cache the URL to use the same server for all operations cache = ::Registration::Storage::Cache.instance diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.110/test/inst_scc_test.rb new/yast2-registration-3.1.111/test/inst_scc_test.rb --- old/yast2-registration-3.1.110/test/inst_scc_test.rb 2014-08-26 14:24:32.000000000 +0200 +++ new/yast2-registration-3.1.111/test/inst_scc_test.rb 2014-08-27 08:39:31.000000000 +0200 @@ -15,12 +15,12 @@ allow(Yast::UI).to receive(:ChangeWidget) allow(Yast::UI).to receive(:SetFocus) allow(Yast::UI).to receive(:ReplaceWidget) - expect(Registration::SwMgmt).to receive(:find_base_product).and_return("name" => "SLES") end context "the system is already registered" do before do - expect(Registration::Registration).to receive(:is_registered?).and_return(true) + expect(Registration::Registration).to receive(:is_registered?).at_least(:once).and_return(true) + expect(Registration::SwMgmt).to receive(:find_base_product).at_least(:once).and_return("name" => "SLES") end it "returns :abort when closing the status dialog" do @@ -28,6 +28,32 @@ expect(Yast::UI).to receive(:UserInput).and_return(:cancel) expect(Yast::WFM.call("inst_scc")).to eq(:abort) end + + it "goes back to initial screen when aborting selection of url" do + # User clicks on 'select extensions' first time the initial screen is + # displayed and 'finish' the second time + expect(Yast::UI).to receive(:UserInput).and_return(:extensions, :next) + # User cancels the selection of registration url + expect_any_instance_of(Yast::InstSccClient).to receive(:init_registration).and_return(:cancel) + # Initial screen is displayed twice + expect_any_instance_of(Yast::InstSccClient).to receive(:registration_check).twice.and_call_original + + expect(Yast::WFM.call("inst_scc")).to eq(:next) + end + end + + context "the system is updating reusing old credentials" do + before do + expect_any_instance_of(Yast::InstSccClient).to receive(:registration_check).and_return(:update) + end + + it "switchs to manual registration when aborting selection of url" do + # User cancels the selection of registration url + expect_any_instance_of(Yast::InstSccClient).to receive(:init_registration).and_return(:cancel) + # So manual registration dialog is displayed + expect_any_instance_of(Yast::InstSccClient).to receive(:register_base_system).and_return(:cancel) + expect(Yast::WFM.call("inst_scc")).to eq(:abort) + end end end continue with "q"... Checked in at Wed Aug 27 16:13:09 CEST 2014 by bg Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org