aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-03-21 11:54:09 +0000
committerThierry Vignaud <tv@mandriva.org>2007-03-21 11:54:09 +0000
commit1df0880ba80ae653b29cc524defe4d632c741a6a (patch)
tree2ff108efc503a541d88ee159fe5beb8724657b3f
parente9594d14856164208f201e0093266d4d1216dcf1 (diff)
downloadrpmdrake-1df0880ba80ae653b29cc524defe4d632c741a6a.tar
rpmdrake-1df0880ba80ae653b29cc524defe4d632c741a6a.tar.gz
rpmdrake-1df0880ba80ae653b29cc524defe4d632c741a6a.tar.bz2
rpmdrake-1df0880ba80ae653b29cc524defe4d632c741a6a.tar.xz
rpmdrake-1df0880ba80ae653b29cc524defe4d632c741a6a.zip
(do_action) add support for 'cancel_perform' exception
-rw-r--r--Rpmdrake/gui.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index d42602db..fe3333df 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -670,7 +670,8 @@ Do you really want to install all the selected packages?"), yesno => 1)
sub do_action {
my ($options, $callback_action, $o_info) = @_;
my $res = eval { do_action__real($options, $callback_action, $o_info) };
- if (my $err = $@) {
+ my $err = $@;
+ if ($err && $err !~ /cancel_perform/) {
interactive_msg(N("Fatal error"),
N("A fatal error occurred: %s.", $err));
}