From ac35290eadfa0a77b9ac38a82856a9808a6cf223 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 31 Mar 2009 15:27:42 +0000
Subject: (_install_raw) tell urpmi to stop transactions when clicking on
 "cancel" (needs urpmi >= 6.25)

---
 perl-install/install/NEWS    | 2 ++
 perl-install/install/pkgs.pm | 3 +++
 2 files changed, 5 insertions(+)

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");
-- 
cgit v1.2.1