summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-31 15:27:42 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-31 15:27:42 +0000
commitac35290eadfa0a77b9ac38a82856a9808a6cf223 (patch)
treec9d3c7c32d643b68c627820b861924361d081d2e /perl-install
parent9b36acf40ebca2695eb83e2e4edfa61caf08d7ac (diff)
downloaddrakx-ac35290eadfa0a77b9ac38a82856a9808a6cf223.tar
drakx-ac35290eadfa0a77b9ac38a82856a9808a6cf223.tar.gz
drakx-ac35290eadfa0a77b9ac38a82856a9808a6cf223.tar.bz2
drakx-ac35290eadfa0a77b9ac38a82856a9808a6cf223.tar.xz
drakx-ac35290eadfa0a77b9ac38a82856a9808a6cf223.zip
(_install_raw) tell urpmi to stop transactions when clicking on
"cancel" (needs urpmi >= 6.25)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/pkgs.pm3
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4d0080fe3..7a910a05c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -3,6 +3,8 @@
- make button name match text when inserting a CD ("cancel" rather
than "previous")
- rotate /root/drakx/install1.log too
+- tell urpmi to stop transactions when clicking on "cancel" (needs
+ urpmi >= 6.25)
- don't list installed distros with other archs as upgrading between
archs is not supported
- display the version of the distro in the install/upgrade screen (#44602)
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index d499e9f5e..188e81f05 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -769,6 +769,9 @@ sub _install_raw {
my ($medium) = @_;
$::o->ask_change_cd($medium);
},
+ is_canceled => sub {
+ return $install::pkgs::cancel_install;
+ },
trans_error_summary => sub {
my ($nok, $errors) = @_;
log::l($nok . " installation transactions failed");