Code review fixes

yast · Jan 26, 2018 · 59c3f41 · 59c3f41
1 parent f73c080
commit 59c3f41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/lib/registration/clients/inst_migration_repos.rb b/src/lib/registration/clients/inst_migration_repos.rb
@@ -39,8 +39,8 @@ def main
 
       # Pass the target directory to SUSEConnect
       def set_target_path
-        destdir = Yast::Installation.destdir
-        return if destdir.nil? || destdir == "/"
+        destdir = Yast::Installation.destdir || "/"
+        return if destdir == "/"
 
         log.info("Setting SUSEConnect target directory: #{destdir}")
         SUSE::Connect::System.filesystem_root = destdir

diff --git a/src/lib/registration/ui/migration_repos_workflow.rb b/src/lib/registration/ui/migration_repos_workflow.rb
@@ -251,7 +251,7 @@ def merge_registered_addons
       # loads online or offline migrations depending on the system state
       # @return [Symbol] workflow symbol (:next or :abort)
       def load_migration_products
-        if Yast::Stage.initial && Yast::Mode.update
+        if Yast::Stage.initial
           load_migration_products_offline
         else
           load_migration_products_online
@@ -542,10 +542,8 @@ def upgraded_base_product
 
         # restore the initial status, the package update will be turned on later again
         Yast::Pkg.PkgReset
-        changed = Yast::Pkg.ResolvableProperties("", :package, "").select do |p|
-          p["status"] != :available || p["status"] != :installed
-        end
-        changed.each { |p| Yast::Pkg.PkgNeutral(p["name"]) }
+        changed = Yast::Pkg.GetPackages(:removed, true) + Yast::Pkg.GetPackages(:selected, true)
+        changed.each { |p| Yast::Pkg.PkgNeutral(p) }
 
         log.info("Upgraded base product: #{product.inspect}")
         product