From 59e98d059fb60c1e01b67165ca4432e5cc295c98 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Thu, 5 Sep 2002 10:00:57 +0000
Subject: flepied wants grpmi to abort when conflicts are detected

---
 grpmi/grpmi.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'grpmi')

diff --git a/grpmi/grpmi.pl b/grpmi/grpmi.pl
index 06af2ac1..b73afe05 100755
--- a/grpmi/grpmi.pl
+++ b/grpmi/grpmi.pl
@@ -77,6 +77,7 @@ $mainw->{rwindow}->set_position('center');
 $mainw->sync;
 
 my $exitstatus = -1;
+my $forced_exitstatus;
 
 
 # -=-=-=---=-=-=---=-=-=-- download potential URL's, and verify signatures -=-=-=---=-=-=--
@@ -145,8 +146,10 @@ if (grep { /^[^-]/ } @ARGV) {
 _("Conflicts were detected:
 %s
 
-Do you want to force the install anyway?",
-					      join("\n", split(/\|/, $1))), 1) ? 0 : 1
+Install aborted.",
+					      join("\n", split(/\|/, $1))));
+			    $forced_exitstatus = -1;
+			    return 1;
 					},
 			'inst-start' => sub { $install_progress++;
 					      $label->set(_("Installing package `%s' (%s/%s)...", $1, $install_progress, $nb_installs));
@@ -178,4 +181,4 @@ if (!member('noclearcache', @grpmi_config)) {
 	/^\Q$cache_location/ and unlink;
     }
 }
-mexit $exitstatus;
+mexit($forced_exitstatus || $exitstatus);
-- 
cgit v1.2.1