summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-26 20:02:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-26 20:02:54 +0000
commitcb37261bbf2cc23c16e0edd848e681ffc12392b6 (patch)
tree6ddd2a0e1e77accdb2d62321b4d1d055f138d6bc
parente0c2462f94c7bada64cf9d746839202929d2ef4b (diff)
downloadurpmi-cb37261bbf2cc23c16e0edd848e681ffc12392b6.tar
urpmi-cb37261bbf2cc23c16e0edd848e681ffc12392b6.tar.gz
urpmi-cb37261bbf2cc23c16e0edd848e681ffc12392b6.tar.bz2
urpmi-cb37261bbf2cc23c16e0edd848e681ffc12392b6.tar.xz
urpmi-cb37261bbf2cc23c16e0edd848e681ffc12392b6.zip
rename some vars
-rw-r--r--urpm/get_pkgs.pm26
1 files changed, 12 insertions, 14 deletions
diff --git a/urpm/get_pkgs.pm b/urpm/get_pkgs.pm
index 4bda4e99..cff1ee97 100644
--- a/urpm/get_pkgs.pm
+++ b/urpm/get_pkgs.pm
@@ -137,14 +137,12 @@ sub download_packages_of_distant_media {
}
}
- my $partial_dir = "$urpm->{cachedir}/partial";
- my $rpms_dir = "$urpm->{cachedir}/rpms";
- if (%distant_sources && ! -w $partial_dir) {
+ my $cachedir = $urpm->{cachedir};
+ if (%distant_sources && ! -w "$cachedir/partial") {
if (my $userdir = urpm::userdir($urpm)) {
- $partial_dir = "$userdir/partial";
- $rpms_dir = "$userdir/rpms";
- mkdir $download_dir;
- mkdir $rpms_dir;
+ $cachedir = $userdir;
+ mkdir "$cachedir/partial";
+ mkdir "$cachedir/rpms";
} else {
$urpm->{error}(N("sorry, you can't use --install-src to install remote .src.rpm files"));
exit 1;
@@ -155,7 +153,7 @@ sub download_packages_of_distant_media {
if (%distant_sources) {
$urpm->{log}(N("retrieving rpm files from medium \"%s\"...", $urpm->{media}[$n]{name}));
if (urpm::download::sync($urpm, $urpm->{media}[$n], [ values %distant_sources ],
- dir => $partial_dir, quiet => $options{quiet},
+ dir => "$cachedir/partial", quiet => $options{quiet},
resume => $urpm->{options}{resume}, callback => $options{callback})) {
$urpm->{log}(N("...retrieving done"));
} else {
@@ -167,14 +165,14 @@ sub download_packages_of_distant_media {
#- present the error to the user.
foreach my $i (keys %distant_sources) {
my ($filename) = $distant_sources{$i} =~ m|/([^/]*\.rpm)$|;
- if ($filename && -s "$partial_dir/$filename") {
- if (URPM::verify_rpm("$partial_dir/$filename", nosignatures => 1)) {
+ if ($filename && -s "$cachedir/partial/$filename") {
+ if (URPM::verify_rpm("$cachedir/partial/$filename", nosignatures => 1)) {
#- it seems the the file has been downloaded correctly and has been checked to be valid.
- unlink "$rpms_dir/$filename";
- urpm::sys::move_or_die($urpm, "$partial_dir/$filename", "$rpms_dir/$filename");
- $sources->{$i} = "$rpms_dir/$filename";
+ unlink "$cachedir/rpms/$filename";
+ urpm::sys::move_or_die($urpm, "$cachedir/partial/$filename", "$cachedir/rpms/$filename");
+ $sources->{$i} = "$cachedir/rpms/$filename";
} else {
- unlink "$partial_dir/$filename";
+ unlink "$cachedir/partial/$filename";
$errors{$i} = [ $distant_sources{$i}, 'bad' ];
}
} else {