much nicer userdir() functions:

- userdir() does not modify $urpm->{cachedir} anymore,
  if you must ensure $urpm->{cachedir} to be modified, use
  ensure_valid_cachedir()
- valid_cachedir() gives you a valid cachedir (works for root or simple-user),
  but does not modify $urpm->{cachedir}

1 files changed, 3 insertions, 5 deletions

diff --git a/urpm/media.pm b/urpm/media.pm
index 94fb7f69..fae5abb2 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1763,12 +1763,10 @@ sub _any_media_info__or_download {
     -s $f and return $f;
 
     my $download_dir;
-    if (my $userdir = urpm::userdir($urpm)) {
-	$f = "$userdir/" . statedir_media_info_basename($medium, $prefix, $suffix);
+    if ($<) {
+	urpm::ensure_valid_cachedir($urpm);
+	$f = "$urpm->{cachedir}/" . statedir_media_info_basename($medium, $prefix, $suffix);
 	-s $f and return $f;
-
-	$download_dir = "$userdir/partial";
-	mkdir $download_dir;
     }
 
     get_medium_option($urpm, $medium, 'xml-info') ne 'never' or return;