diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-03-24 12:51:59 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-03-24 12:51:59 +0000 |
| commit | 50044e8371ad067f90f536e09d3f363d789d687e (patch) | |
| tree | 98efee7fd91271aa7e63bc1f98ce80aa4a0cf864 | |
| parent | 099c775550ea552fbd7ba4695b7f7ceeb24adb77 (diff) | |
| download | rpmdrake-50044e8371ad067f90f536e09d3f363d789d687e.tar rpmdrake-50044e8371ad067f90f536e09d3f363d789d687e.tar.gz rpmdrake-50044e8371ad067f90f536e09d3f363d789d687e.tar.bz2 rpmdrake-50044e8371ad067f90f536e09d3f363d789d687e.tar.xz rpmdrake-50044e8371ad067f90f536e09d3f363d789d687e.zip | |
explicitely destroy $gurpm
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Rpmdrake/pkg.pm | 8 |
2 files changed, 6 insertions, 4 deletions
@@ -1,3 +1,5 @@ +- better dialog destruction + Version 5.44 - 21 Mar 2013, Thierry Vignaud - adapt to gurpmi enabling to cancel again downloads diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 82d6c12f..ae39c312 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -645,7 +645,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( local $urpm->{fatal} = sub { my $fatal_msg = $_[1]; printf STDERR "Fatal: %s\n", $fatal_msg; - undef $gurpm; + $gurpm->destroy; interactive_msg(N("Installation failed"), N("There was a problem during the installation:\n\n%s", $fatal_msg)); goto return_with_exit_code; @@ -733,7 +733,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( $gurpm = gurpm::RPMProgressDialog->new($urpm); $gurpm->label(1 ? N("Please wait") : N("Package installation...")); - my $_gurpm_clean_guard = before_leaving { undef $gurpm }; + my $_gurpm_clean_guard = before_leaving { $gurpm->destroy }; my $something_installed; if (@to_install && $::rpmdrake_options{auto_orphans}) { @@ -767,7 +767,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( completed => sub { # explicitly destroy the progress window when it's over; we may # have sg to display before returning (errors, rpmnew/rpmsave, ...): - undef $gurpm; + $gurpm->destroy; undef $lock; undef $rpm_lock; @@ -929,7 +929,7 @@ sub perform_removal { my $gurpm = gurpm::RPMProgressDialog->new($urpm); $gurpm->label(1 ? N("Please wait") : N("Please wait, removing packages...")); $gurpm->init_progressbar; - my $_gurpm_clean_guard = before_leaving { undef $gurpm }; + my $_gurpm_clean_guard = before_leaving { $gurpm->destroy }; $urpm->{nb_install} = @toremove; my $may_be_orphans = 1; |