From ef5d4874ed831dfcdc342d4ca3c52e742686d974 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Thu, 13 Feb 2003 14:31:52 +0000
Subject: if there was an error during installation, propose to remove the
 cached/downloaded packages or not (partially follows a nice suggestion by
 Jeff Martin <jeffm at tampabay.rr.com>)

---
 grpmi/grpmi.pl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'grpmi')

diff --git a/grpmi/grpmi.pl b/grpmi/grpmi.pl
index d763e61e..f5be91cb 100755
--- a/grpmi/grpmi.pl
+++ b/grpmi/grpmi.pl
@@ -203,12 +203,16 @@ Install aborted.",
 
 # -=-=-=---=-=-=---=-=-=-- cleanup -=-=-=---=-=-=--
 $exitstatus = 0;
-$mainw->{rwindow}->hide;
 cleanup:
 if (!member('noclearcache', @grpmi_config)) {
-    foreach (@ARGV) {
-	s/^-skipped&([^&]+)&$/$1/;
-	/^\Q$cache_location/ and unlink;
+    my @toclean = map { s/^-skipped&([^&]+)&$/$1/; if_(/^\Q$cache_location/, $_) } @ARGV;
+    if ($forced_exitstatus || $exitstatus) {
+	interactive_msg(_("Cleanup"),
+_("Cleanup question: there was an error during installation, do you want to
+remove the %d downloaded package(s)?
+(they are located in %s)", scalar(@toclean), $cache_location), 1) or goto exiting;
     }
+    unlink @toclean;
 }
+exiting:
 mexit($forced_exitstatus || $exitstatus);
-- 
cgit v1.2.1