summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-26 20:08:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-26 20:08:13 +0000
commit1e644fce19ac143afcb0de8c7475e3f8349264c6 (patch)
tree869e2fe97a6c8f661f27957520e7c9674167bb39
parentf5c9e895354f331843c53b97c5695ffa6c2c5b52 (diff)
downloadurpmi-1e644fce19ac143afcb0de8c7475e3f8349264c6.tar
urpmi-1e644fce19ac143afcb0de8c7475e3f8349264c6.tar.gz
urpmi-1e644fce19ac143afcb0de8c7475e3f8349264c6.tar.bz2
urpmi-1e644fce19ac143afcb0de8c7475e3f8349264c6.tar.xz
urpmi-1e644fce19ac143afcb0de8c7475e3f8349264c6.zip
use urpm::get_pkgs::verify_partial_rpm_and_move()
-rw-r--r--urpm/removable.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/urpm/removable.pm b/urpm/removable.pm
index 2e0c4ff9..7885653a 100644
--- a/urpm/removable.pm
+++ b/urpm/removable.pm
@@ -5,6 +5,7 @@ package urpm::removable;
use urpm::msg;
use urpm::sys;
use urpm::util;
+use urpm::get_pkgs;
use urpm 'file_from_local_url';
@@ -159,11 +160,8 @@ sub _examine_removable_medium_ {
unlink "$urpm->{cachedir}/partial/$filename";
$urpm->{log}("copying $filepath");
if (copy_and_own($filepath, "$urpm->{cachedir}/partial/$filename") &&
- URPM::verify_rpm("$urpm->{cachedir}/partial/$filename", nosignatures => 1))
+ urpm::get_pkgs::verify_partial_rpm_and_move($urpm, $urpm->{cachedir}, $filename))
{
- #- now we can consider the file to be fine.
- unlink "$urpm->{cachedir}/rpms/$filename";
- urpm::sys::move_or_die($urpm, "$urpm->{cachedir}/partial/$filename", "$urpm->{cachedir}/rpms/$filename");
$sources->{$i} = "$urpm->{cachedir}/rpms/$filename";
}
}