aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-06 14:01:50 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-06 14:01:50 +0000
commit043ed66a82c29af960319743e4cee51fdeb57164 (patch)
treea1f21c5edc50fda71a1ffb59ccf912e7758c4382
parentca3842185d001dc8912b8bbbb0f9ea3a00cb2064 (diff)
downloadrpmdrake-043ed66a82c29af960319743e4cee51fdeb57164.tar
rpmdrake-043ed66a82c29af960319743e4cee51fdeb57164.tar.gz
rpmdrake-043ed66a82c29af960319743e4cee51fdeb57164.tar.bz2
rpmdrake-043ed66a82c29af960319743e4cee51fdeb57164.tar.xz
rpmdrake-043ed66a82c29af960319743e4cee51fdeb57164.zip
(ask_yes_or_no) behaves like urpmi, allow to continue, thus skipping
the bogus transaction instead of short-circuiting urpm::main_loop
-rw-r--r--NEWS2
-rw-r--r--Rpmdrake/pkg.pm5
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index f9636787..045b2069 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
- rpmdrake:
+ o behaves like urpmi, allow to continue, thus skipping the bogus
+ transaction instead of short-circuiting urpm::main_loop
o fix some error dialogs not being modal
o update GUI package list
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 6121b35b..98fcf0cc 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -721,12 +721,13 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
my ($title, $msg) = @_;
local $::main_window = $gurpm->{real_window};
interactive_msg($title, $msg, yesno => 1, scroll => 1,
- ) or goto return_with_exit_code;
+ );
},
message => sub {
my ($title, $message) = @_;
interactive_msg($title, $message, scroll => 1);
},
+ # cancel installation when 'cancel' button is pressed:
trans_log => sub { download_callback($gurpm, @_) or goto return_with_exit_code },
post_extract => sub {
my ($set, $transaction_sources, $transaction_sources_install) = @_;
@@ -763,7 +764,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
$msg =~ s/:$/\n\n/m; # FIXME: to be fixed in urpmi after 2008.0
interactive_msg(
N("Warning"), "$msg\n\n$msg2", yesno => 1, if_(10 < ($msg =~ tr/\n/\n/), scroll => 1),
- ) or goto return_with_exit_code;
+ );
},
post_download => sub {
$canceled and goto return_with_exit_code;