display the upgraded product name

yast · Sep 21, 2015 · 83d02c1 · 83d02c1
1 parent ae1b9dd
commit 83d02c1
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/lib/registration/ui/migration_repos_workflow.rb b/src/lib/registration/ui/migration_repos_workflow.rb
@@ -237,12 +237,8 @@ def register_migration_products
 
         begin
           log.info "Registering the migration target products"
-          Yast::Popup.Feedback(RegistrationUI::CONTACTING_MESSAGE,
-            # TRANSLATORS: Progress label
-            _("Registering Migration Products...")) do
-            if !selected_migration.all? { |product| register_migration_product(product) }
-              return :abort
-            end
+          if !selected_migration.all? { |product| register_migration_product(product) }
+            return :abort
           end
         ensure
           Yast::Wizard.EnableNextButton
@@ -276,10 +272,18 @@ def migration_progress
       # @return [Boolean] true on success
       def register_migration_product(product)
         log.info "Registering migration product #{product}"
+        ret = nil
+
+        Yast::Popup.Feedback(RegistrationUI::CONTACTING_MESSAGE,
+          # TRANSLATORS: Progress label
+          _("Updating to %s ...") % product.friendly_name) do
 
-        ConnectHelpers.catch_registration_errors do
-          registered_services << registration.upgrade_product(product)
+          ret = ConnectHelpers.catch_registration_errors do
+            registered_services << registration.upgrade_product(product)
+          end
         end
+
+        ret
       end
 
       # activate the added migration repos (set the DUP property)