From 354aaa492e6e5b824d29a71f8dc0e49a635c497e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 26 Mar 2007 11:13:16 +0000
Subject: (perform_installation) when canceling, reload the db if we removed sg
 but didn't installed anything

---
 Rpmdrake/pkg.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Rpmdrake')

diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 575a6388..edd3cfbe 100755
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -604,7 +604,8 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
                                                                    Rpmdrake::gurpm::progress(1);
                                                                    Rpmdrake::gurpm::invalidate_cancel();
                                                                }
-                                                               $canceled and return 'canceled';
+                                                               $canceled and goto return_with_exit_code;
+
                                                            },
                                                        );
         $canceled and goto return_with_exit_code;
@@ -742,7 +743,7 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
 		    join("\n\n", @errors, @error_msgs)),
 		if_(@errors + @error_msgs > 1, scroll => 1),
 	    );
-            return !$something_installed;
+            goto return_with_exit_code;
         }
 
         my %pkg2rpmnew;
-- 
cgit v1.2.1