Merge pull request #517 from yast/fix_firstboot_master

Fix firstboot master
yast · Nov 2, 2020 · 1f5a91f · 1f5a91f
2 parents 8860e36 + 1b8523e
commit 1f5a91f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 27 15:50:31 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- Fix the latest change to work in firstboot when system is
+  registered (bsc#1178128)
+- 4.3.13
+
 -------------------------------------------------------------------
 Mon Oct 19 13:21:42 CEST 2020 - schubi@suse.de
 
@@ -25,7 +32,7 @@ Thu Oct  1 14:15:55 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
 
 - Fixed upgrade using the Full medium with the "media_upgrade=1"
   boot option (bsc#1176563)
-- 4.3.9 
+- 4.3.9
 
 -------------------------------------------------------------------
 Mon Aug 24 11:31:58 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        4.3.12
+Version:        4.3.13
 Release:        0
 Summary:        YaST2 - Registration Module
 License:        GPL-2.0-only

diff --git a/src/lib/registration/clients/inst_scc.rb b/src/lib/registration/clients/inst_scc.rb
@@ -226,6 +226,8 @@ def registration_check
       return :register unless ::Registration::Registration.is_registered?
 
       log.info "The system is already registered, displaying registered dialog"
+      # ensure that @registration is initialized
+      return :cancel if init_registration == :cancel
       ::Registration::UI::RegisteredSystemDialog.run(
         extensions_enabled: !Registration::Addon.find_all(@registration).empty?
       )

diff --git a/test/inst_scc_test.rb b/test/inst_scc_test.rb
@@ -49,19 +49,6 @@
 
       expect(subject.main).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(subject).to receive(:init_registration).and_return(:cancel)
-      # Initial screen is displayed twice
-      expect(subject).to receive(:registration_check)
-        .twice.and_call_original
-
-      expect(subject.main).to eq(:next)
-    end
   end
 
   context "the system is updating reusing old credentials" do