From 64f60e96cd8b895cfd908d030d5e6d482b53b98f Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@mandriva.com>
Date: Thu, 15 Oct 2009 17:12:03 +0000
Subject: allow to define the cache directory for RPMs when setting
 --download-all

---
 urpm.pm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'urpm.pm')

diff --git a/urpm.pm b/urpm.pm
index ee0fb519..44b1ed16 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -99,15 +99,9 @@ sub prefer_rooted {
     -e "$root$file" ? "$root$file" : $file;
 }
 
-sub userdir_prefix {
-    my ($_urpm) = @_;
-    '/tmp/.urpmi-';
-}
-sub userdir {
-    my ($urpm) = @_;
-    $< or return;
+sub init_cache_dir {
+    my ($urpm, $dir) = @_;
 
-    my $dir = ($urpm->{urpmi_root} || '') . userdir_prefix($urpm) . $<;
     mkdir $dir, 0755; # try to create it
 
     -d $dir && ! -l $dir or $urpm->{fatal}(1, N("fail to create directory %s", $dir));
@@ -118,6 +112,17 @@ sub userdir {
 
     $dir;
 }
+sub userdir_prefix {
+    my ($_urpm) = @_;
+    '/tmp/.urpmi-';
+}
+sub userdir {
+    my ($urpm) = @_;
+    $< or return;
+
+    my $dir = ($urpm->{urpmi_root} || '') . userdir_prefix($urpm) . $<;
+    init_cache_dir($$urpm, $dir);
+}
 sub ensure_valid_cachedir {
     my ($urpm) = @_;
     if (my $dir = userdir($urpm)) {
-- 
cgit v1.2.1