diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-04-21 00:01:12 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-04-21 00:01:12 +0000 |
| commit | 875acbf056ed84ef34bbd2c6463292317f620eef (patch) | |
| tree | 9a7f925180b03bec14ddb754c7b1f898c8d93c46 | |
| parent | c60ccd3efa3d24338ded284fcdf177c3fe8b76fb (diff) | |
| download | rpmdrake-875acbf056ed84ef34bbd2c6463292317f620eef.tar rpmdrake-875acbf056ed84ef34bbd2c6463292317f620eef.tar.gz rpmdrake-875acbf056ed84ef34bbd2c6463292317f620eef.tar.bz2 rpmdrake-875acbf056ed84ef34bbd2c6463292317f620eef.tar.xz rpmdrake-875acbf056ed84ef34bbd2c6463292317f620eef.zip | |
fix install dialog being on top of sub dialogs (mga#9646)
(needs urpmi >= 7.25)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | Rpmdrake/pkg.pm | 4 |
2 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,5 @@ - fix install dialog title (mga#9550) +- fix install dialog being on top of sub dialogs (mga#9646) Version 5.46 - 26 Mar 2013, Thierry Vignaud diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 0bb6a3ee..0af51bc0 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -732,7 +732,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( # select packages to uninstall for !update mode: perform_removal($urpm, { map { $_ => $pkgs->{$_} } @to_remove }) if !$probe_only_for_updates; - $gurpm = gurpm::RPMProgressDialog->new($urpm); + $gurpm = gurpm::RPMProgressDialog->new($urpm, undef, 1); $gurpm->label(1 ? N("Please wait") : N("Package installation...")); my $_gurpm_clean_guard = before_leaving { $gurpm->destroy }; my $something_installed; @@ -778,7 +778,6 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( ask_yes_or_no => sub { # handle 'allow-force' and 'allow-nodeps' options: my ($title, $msg) = @_; - local $::main_window = $gurpm->{real_window}; interactive_msg($title, $msg, yesno => 1, scroll => 1, ); }, @@ -816,7 +815,6 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( #check_sig => sub { $gurpm->set_progressbar(++$progress/$total) }, bad_signature => sub { my ($msg, $msg2) = @_; - local $::main_window = $gurpm->{real_window}; $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), |