aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-03-26 11:13:16 +0000
committerThierry Vignaud <tv@mandriva.org>2007-03-26 11:13:16 +0000
commit354aaa492e6e5b824d29a71f8dc0e49a635c497e (patch)
tree575112bbd306699dda589615e05d80dba5ba3857 /Rpmdrake
parent9c26dede402a13aff3df8018d1da8f46a1c1fb8b (diff)
downloadrpmdrake-354aaa492e6e5b824d29a71f8dc0e49a635c497e.tar
rpmdrake-354aaa492e6e5b824d29a71f8dc0e49a635c497e.tar.gz
rpmdrake-354aaa492e6e5b824d29a71f8dc0e49a635c497e.tar.bz2
rpmdrake-354aaa492e6e5b824d29a71f8dc0e49a635c497e.tar.xz
rpmdrake-354aaa492e6e5b824d29a71f8dc0e49a635c497e.zip
(perform_installation) when canceling, reload the db if we removed sg
but didn't installed anything
Diffstat (limited to 'Rpmdrake')
-rwxr-xr-xRpmdrake/pkg.pm5
1 files changed, 3 insertions, 2 deletions
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;