Code review fix

yast · Mar 19, 2021 · ca7e906 · ca7e906
1 parent 0b5b634
commit ca7e906
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/clients/inst_kickoff.rb b/src/clients/inst_kickoff.rb
@@ -46,18 +46,7 @@ def main
         )
       end
 
-      # copy the zypp cache to the target system (only when running in inst-sys!)
-      if Stage.initial
-        # copy the credential files (libzypp loads them from target)
-        # and the repository cache to the target system
-        Pkg.SourceCacheCopyTo(Installation.destdir)
-
-        # symlink the cache from inst-sys to save same space (RAM!)
-        cache_path = Pkg.ZConfig()["repo_cache_path"] || "/var/cache/zypp"
-        log.info("Zypp cache size: #{`du -h -s #{cache_path.shellescape}`}")
-        ::FileUtils.rm_rf(cache_path)
-        File.symlink(File.join(Installation.destdir, cache_path), cache_path)
-      end
+      copy_zypp_cache
 
       # installation, for instance...
       if !Mode.update
@@ -142,6 +131,21 @@ def main
       :next
     end
 
+    # copy the zypp cache to the target system (only when running in inst-sys!)
+    def copy_zypp_cache
+      return unless Stage.initial
+
+      # copy the credential files (libzypp loads them from target)
+      # and the repository cache to the target system
+      Pkg.SourceCacheCopyTo(Installation.destdir)
+
+      # symlink the cache from inst-sys to save same space (RAM!)
+      cache_path = Pkg.ZConfig()["repo_cache_path"] || "/var/cache/zypp"
+      log.info("Zypp cache size: #{`du -h -s #{cache_path.shellescape}`}")
+      ::FileUtils.rm_rf(cache_path)
+      File.symlink(File.join(Installation.destdir, cache_path), cache_path)
+    end
+
     #  Handle the backup.
     def backup_stuff
       if Installation.update_backup_modified