Catch exceptions also when loading the available extensions (bsc#941491)

- 3.1.141
yast · Aug 14, 2015 · 3bdd5a9 · 3bdd5a9
1 parent c3d152a
commit 3bdd5a9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 14 10:45:56 UTC 2015 - lslezak@suse.cz
+
+- Catch exceptions also when loading the available extensions
+  (bsc#941491)
+- 3.1.141
+
 -------------------------------------------------------------------
 Fri Aug 14 08:20:21 UTC 2015 - lslezak@suse.cz
 

diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        3.1.140
+Version:        3.1.141
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/inst_scc.rb b/src/clients/inst_scc.rb
@@ -154,7 +154,11 @@ def get_available_addons
       # cache the available addons
       return :cancel if init_registration == :cancel
 
-      registration_ui.get_available_addons
+      addons_loaded = Registration::ConnectHelpers.catch_registration_errors do
+        registration_ui.get_available_addons
+      end
+
+      return :cancel unless addons_loaded
 
       @addons_registered_orig = Registration::Addon.registered.dup
     end