aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-21 22:52:29 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-21 22:52:29 +0000
commit9eb2e698e43a7f3842f221a90f28c02c7dd0bd33 (patch)
tree5276084591f3e323967b9554161a1d6c601bbd58
parente87bd3a7e7a00df990cce06e6f43badbc3442f55 (diff)
downloadrpmdrake-9eb2e698e43a7f3842f221a90f28c02c7dd0bd33.tar
rpmdrake-9eb2e698e43a7f3842f221a90f28c02c7dd0bd33.tar.gz
rpmdrake-9eb2e698e43a7f3842f221a90f28c02c7dd0bd33.tar.bz2
rpmdrake-9eb2e698e43a7f3842f221a90f28c02c7dd0bd33.tar.xz
rpmdrake-9eb2e698e43a7f3842f221a90f28c02c7dd0bd33.zip
adapt to gurpmi enabling to cancel again downloads
-rw-r--r--NEWS2
-rw-r--r--Rpmdrake/pkg.pm4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index f7c94fe6..5bc24530 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- adapt to gurpmi enabling to cancel again downloads
+
Version 5.43 - 21 Mar 2013, Thierry Vignaud
- fix download progress with global progress bar (mga#9469)
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index a2742b21..a421a7db 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -824,8 +824,8 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
);
},
post_download => sub {
- $canceled and goto return_with_exit_code;
- #$gurpm->invalidate_cancel_forever; # FIXME: cancel
+ $gurpm->canceled and goto return_with_exit_code;
+ $gurpm->invalidate_cancel_forever;
},
need_restart => sub {
my ($need_restart_formatted) = @_;