From 5e1c20f181fac8df0636ecd04b24832ddb6cbc27 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 24 Feb 2008 10:06:23 +0000
Subject: make it fatal to fail to remove cachedir rpms

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

(limited to 'urpm/install.pm')

diff --git a/urpm/install.pm b/urpm/install.pm
index ec069548..3c0e91f3 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -194,7 +194,7 @@ sub install {
 		my $cachefile = "$urpm->{cachedir}/rpms/" . $pkg->filename;
 		if (-e $cachefile) {
 		    $urpm->{error}(N("removing bad rpm (%s) from %s", $pkg->name, "$urpm->{cachedir}/rpms"));
-		    unlink $cachefile;
+		    unlink $cachefile or $urpm->{fatal}(1, N("removing %s failed: %s", $cachefile, $!));
 		}
 	    }
 	}
@@ -250,7 +250,9 @@ sub install {
 	    my $cachedir = "$urpm->{cachedir}/rpms";
 	    my @pkgs = grep { -e "$cachedir/$_" } map { $_->filename } @trans_pkgs;
 	    $urpm->{log}(N("removing installed rpms (%s) from %s", join(' ', @pkgs), $cachedir));
-	    unlink "$cachedir/$_" foreach @pkgs;
+	    foreach (@pkgs) {
+		unlink "$cachedir/$_ " or $urpm->{fatal}(1, N("removing %s failed: %s", $_, $!));
+	    }
 	}
 
 	if ($options{verbose} >= 0) {
-- 
cgit v1.2.1