move package cache to /mnt (bnc#877859)

to avoid freezing the installer when installing big packages with small RAM - 3.1.12
yast · May 27, 2014 · a3d6206 · a3d6206
1 parent 4f15caf
commit a3d6206
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/package/yast2-pkg-bindings-devel-doc.spec b/package/yast2-pkg-bindings-devel-doc.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-pkg-bindings-devel-doc
-Version:        3.1.11
+Version:        3.1.12
 Release:        0
 License:        GPL-2.0
 Group:          Documentation/HTML

diff --git a/package/yast2-pkg-bindings.changes b/package/yast2-pkg-bindings.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May 27 13:18:29 UTC 2014 - lslezak@suse.cz
+
+- move package cache to target system (copy RPMs to /mnt instead of
+  inst-sys (RAM-disk) during installation to avoid freezing the
+  installer when installing big packages with small RAM)
+  (bnc#877859)
+- 3.1.12
+
 -------------------------------------------------------------------
 Tue May 20 06:22:19 UTC 2014 - jreidinger@suse.com
 

diff --git a/package/yast2-pkg-bindings.spec b/package/yast2-pkg-bindings.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-pkg-bindings
-Version:        3.1.11
+Version:        3.1.12
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/PkgFunctions.cc b/src/PkgFunctions.cc
@@ -459,6 +459,26 @@ bool PkgFunctions::RepoManagerUpdateTarget(const std::string& root)
         repo_manager = new_repo_manager;
     }
 
+    // update package cache path for loaded repositories when changing the target
+    if (new_target)
+    {
+        zypp::RepoManagerOptions repo_options(root);
+        zypp::Pathname packages_prefix = repo_options.repoPackagesCachePath;
+
+        zypp::ResPool pool = zypp_ptr()->pool();
+        for_(it, pool.knownRepositoriesBegin(), pool.knownRepositoriesEnd())
+        {
+            zypp::RepoInfo repo = it->info();
+            repo.setPackagesPath(packages_prefix / repo.escaped_alias());
+
+            y2milestone("Setting package cache for repository %s: %s",
+                repo.alias().c_str(),
+                repo.packagesPath().asString().c_str());
+
+            it->setInfo(repo);
+        }
+    }
+
     return new_target;
 }
 

diff --git a/src/Source_Installation.cc b/src/Source_Installation.cc
@@ -29,6 +29,7 @@
 #include "log.h"
 
 #include <zypp/ExternalProgram.h>
+#include <zypp/Pathname.h>
 
 #include <ycp/YCPBoolean.h>
 #include <ycp/YCPVoid.h>
@@ -286,6 +287,7 @@ PkgFunctions::SourceMoveDownloadArea (const YCPString & path)
 	y2milestone("Moving download area of all sources to %s", path->value().c_str());
 	zypp::media::MediaManager manager;
 	manager.setAttachPrefix(path->value());
+
 	_download_area = path->value();
     }
     catch (zypp::Exception & excpt)