From 1e644fce19ac143afcb0de8c7475e3f8349264c6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 26 Feb 2008 20:08:13 +0000
Subject: use urpm::get_pkgs::verify_partial_rpm_and_move()

---
 urpm/removable.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'urpm/removable.pm')

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";
 			}
 		    }
-- 
cgit v1.2.1