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

Conflicts: package/yast2-registration.spec src/clients/inst_scc.rb
yast · Aug 17, 2015 · 5e8e56b · 5e8e56b
1 parent 8d9be30
commit 5e8e56b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
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/src/clients/inst_scc.rb b/src/clients/inst_scc.rb
@@ -367,7 +367,13 @@ 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
 
     # register all selected addons