Merge pull request #527 from yast/cloning_exception

yast · Jan 19, 2021 · 9b58f20 · 9b58f20
2 parents a9056e7 + b263c3f
commit 9b58f20
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 19 14:27:15 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
+
+- Catch exceptions during cloning, display an error popup
+  instead of crash (bsc#1181075)
+- 4.3.18
+
 -------------------------------------------------------------------
 Fri Dec 18 13:44:58 UTC 2020 - Stefan Schubert <schubi@suse.de>
 

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

diff --git a/src/lib/registration/clients/scc_auto.rb b/src/lib/registration/clients/scc_auto.rb
@@ -147,8 +147,9 @@ def write
       end
 
       def read
-        @config.read
-        true
+        ::Registration::ConnectHelpers.catch_registration_errors do
+          @config.read
+        end
       end
 
       # return extra packages needed by this module (none so far)