From 77c15b162bb24f8c3727eeaea69d53ee0199688a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Mon, 21 Sep 2015 22:03:20 +0200 Subject: [PATCH] display the upgraded product name --- .../ui/migration_repos_workflow.rb | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/lib/registration/ui/migration_repos_workflow.rb b/src/lib/registration/ui/migration_repos_workflow.rb index 5311f5484..5b75e140f 100644 --- 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)