Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package yast2-registration for 
openSUSE:Factory checked in at 2021-07-18 23:44:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-registration.new.2632 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-registration"

Sun Jul 18 23:44:51 2021 rev:74 rq:906662 version:4.4.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes    
2021-06-05 23:30:34.508338124 +0200
+++ 
/work/SRC/openSUSE:Factory/.yast2-registration.new.2632/yast2-registration.changes
  2021-07-18 23:44:54.727063155 +0200
@@ -0,0 +1,7 @@
+
+-------------------------------------------------------------------
+Fri Jul 16 07:20:58 UTC 2021 - Jos?? Iv??n L??pez Gonz??lez <jlo...@suse.com>
+
+- Show errors when loading addons fails (bsc#1187844).
+- 4.4.3
+

Old:
----
  yast2-registration-4.4.2.tar.bz2

New:
----
  yast2-registration-4.4.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.v0g8p8/_old  2021-07-18 23:44:55.151059893 +0200
+++ /var/tmp/diff_new_pack.v0g8p8/_new  2021-07-18 23:44:55.155059863 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        4.4.2
+Version:        4.4.3
 Release:        0
 Summary:        YaST2 - Registration Module
 License:        GPL-2.0-only

++++++ yast2-registration-4.4.2.tar.bz2 -> yast2-registration-4.4.3.tar.bz2 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-registration-4.4.2/package/yast2-registration.changes 
new/yast2-registration-4.4.3/package/yast2-registration.changes
--- old/yast2-registration-4.4.2/package/yast2-registration.changes     
2021-05-25 18:16:23.000000000 +0200
+++ new/yast2-registration-4.4.3/package/yast2-registration.changes     
2021-07-16 14:14:59.000000000 +0200
@@ -1,3 +1,10 @@
+
+-------------------------------------------------------------------
+Fri Jul 16 07:20:58 UTC 2021 - Jos?? Iv??n L??pez Gonz??lez <jlo...@suse.com>
+
+- Show errors when loading addons fails (bsc#1187844).
+- 4.4.3
+
 -------------------------------------------------------------------
 Thu May 20 15:17:35 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-registration-4.4.2/package/yast2-registration.spec 
new/yast2-registration-4.4.3/package/yast2-registration.spec
--- old/yast2-registration-4.4.2/package/yast2-registration.spec        
2021-05-25 18:16:23.000000000 +0200
+++ new/yast2-registration-4.4.3/package/yast2-registration.spec        
2021-07-16 14:14:59.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        4.4.2
+Version:        4.4.3
 Release:        0
 Summary:        YaST2 - Registration Module
 License:        GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-registration-4.4.2/src/lib/registration/ui/migration_repos_workflow.rb
 
new/yast2-registration-4.4.3/src/lib/registration/ui/migration_repos_workflow.rb
--- 
old/yast2-registration-4.4.2/src/lib/registration/ui/migration_repos_workflow.rb
    2021-05-25 18:16:23.000000000 +0200
+++ 
new/yast2-registration-4.4.3/src/lib/registration/ui/migration_repos_workflow.rb
    2021-07-16 14:14:59.000000000 +0200
@@ -24,6 +24,7 @@
 require "registration/registration"
 require "registration/registration_ui"
 require "registration/migration_repositories"
+require "registration/connect_helpers"
 require "registration/releasever"
 require "registration/sw_mgmt"
 require "registration/url_helpers"
@@ -264,8 +265,7 @@
       #
       # @return [Array<Hash>] installed products and addons selected to be 
installed
       def merge_registered_addons
-        # load the extensions to merge the registered but not installed 
extensions
-        Addon.find_all(registration)
+        return unless load_addons
 
         # TRANSLATORS: Popup question, merge this addon that are registered 
but not
         # installed to the current migration products list.
@@ -287,6 +287,18 @@
         products.concat(addons)
       end
 
+      # Tries to load the registered addons
+      #
+      # Registration errors are shown to the user, allowing to retry in some 
cases.
+      #
+      # @return [Boolean] true on success
+      def load_addons
+        ConnectHelpers.catch_registration_errors do
+          # load the extensions to merge the registered but not installed 
extensions
+          Addon.find_all(registration)
+        end
+      end
+
       # load migration products for the installed products from the 
registration server,
       # loads online or offline migrations depending on the system state
       # @return [Symbol] workflow symbol (:next or :abort)

Reply via email to