summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-26 20:56:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-26 20:56:16 +0000
commit4a3e10706816f1e9c81d70de901c64dee593f7a1 (patch)
tree4421098a0f03e42d6a8edc3b12dc9c845409f976 /urpm
parent82b47a5ba4acd92ee48d70f605394d2fc73b7fbc (diff)
downloadurpmi-4a3e10706816f1e9c81d70de901c64dee593f7a1.tar
urpmi-4a3e10706816f1e9c81d70de901c64dee593f7a1.tar.gz
urpmi-4a3e10706816f1e9c81d70de901c64dee593f7a1.tar.bz2
urpmi-4a3e10706816f1e9c81d70de901c64dee593f7a1.tar.xz
urpmi-4a3e10706816f1e9c81d70de901c64dee593f7a1.zip
urpm::get_pkgs::verify_partial_rpm_and_move() return the final rpm
Diffstat (limited to 'urpm')
-rw-r--r--urpm/get_pkgs.pm2
-rw-r--r--urpm/removable.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/urpm/get_pkgs.pm b/urpm/get_pkgs.pm
index 401ccbad..d715e9fc 100644
--- a/urpm/get_pkgs.pm
+++ b/urpm/get_pkgs.pm
@@ -113,7 +113,7 @@ sub verify_partial_rpm_and_move {
#- it seems the the file has been downloaded correctly and has been checked to be valid.
unlink "$cachedir/rpms/$filename";
urpm::sys::move_or_die($urpm, "$cachedir/partial/$filename", "$cachedir/rpms/$filename");
- 1;
+ "$cachedir/rpms/$filename";
}
# TODO verify that files are downloaded from the right corresponding media
diff --git a/urpm/removable.pm b/urpm/removable.pm
index be992150..c94e5eeb 100644
--- a/urpm/removable.pm
+++ b/urpm/removable.pm
@@ -154,8 +154,8 @@ sub _do_the_copy {
unlink "$urpm->{cachedir}/partial/$filename";
$urpm->{log}("copying $filepath");
copy_and_own($filepath, "$urpm->{cachedir}/partial/$filename") or return;
- urpm::get_pkgs::verify_partial_rpm_and_move($urpm, $urpm->{cachedir}, $filename) or return;
- "$urpm->{cachedir}/rpms/$filename";
+ my $f = urpm::get_pkgs::verify_partial_rpm_and_move($urpm, $urpm->{cachedir}, $filename) or return;
+ $f;
}
sub _examine_removable_medium_ {