summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-31 15:21:01 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-31 15:21:01 +0000
commit757705cc72962f5aa2928ded1c536fcefe436fbc (patch)
tree02a158731d560036711406a4631846fd3c82e2f4
parente04e853f78dba410bee91ef667cae20bb0af708b (diff)
downloadurpmi-757705cc72962f5aa2928ded1c536fcefe436fbc.tar
urpmi-757705cc72962f5aa2928ded1c536fcefe436fbc.tar.gz
urpmi-757705cc72962f5aa2928ded1c536fcefe436fbc.tar.bz2
urpmi-757705cc72962f5aa2928ded1c536fcefe436fbc.tar.xz
urpmi-757705cc72962f5aa2928ded1c536fcefe436fbc.zip
(run) enable installer to cancel installation
-rw-r--r--NEWS1
-rw-r--r--urpm/main_loop.pm3
2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 7a9779cb..e96d9a75 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- downgrade cryptic log message to debug message, fixes #49226
+- enable installer to cancel installation
Version 6.24 - 27 March 2009
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index 74e860dd..db4066ab 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -273,6 +273,9 @@ foreach my $set (@{$state->{transaction} || []}) {
}
}
}
+ if ($callbacks->{is_canceled}) {
+ last if $callbacks->{is_canceled}->();
+ }
}
if ($migrate_back_rpmdb_db_version) {