From 11e76d2a686ebfa1676416d0a75c6b0e6c7a5bbc Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 20 Sep 2007 10:22:40 +0000
Subject: (perform_installation,perform_removal) readd guards that really are
 needed

---
 Rpmdrake/pkg.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Rpmdrake')

diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 4c9d666f..a8aa259a 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -562,6 +562,7 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
     perform_removal($urpm, { map { $_ => $pkgs->{$_} } @to_remove }) if !$probe_only_for_updates;
 
     $gurpm = Rpmdrake::gurpm->new(1 ? N("Please wait") : N("Package installation..."), N("Initializing..."), transient => $::main_window);
+    my $_gurpm_clean_guard = before_leaving { undef $gurpm };
     my $canceled;
     my $something_installed;
 
@@ -732,6 +733,7 @@ sub perform_removal {
     my @toremove = map { if_($pkgs->{$_}{selected}, $pkgs->{$_}{urpm_name}) } keys %$pkgs;
     return if !@toremove;
     my $gurpm = Rpmdrake::gurpm->new(1 ? N("Please wait") : N("Please wait, removing packages..."), N("Initializing..."), transient => $::main_window);
+    my $_gurpm_clean_guard = before_leaving { undef $gurpm };
 
     my $progress = -1;
     local $urpm->{log} = sub {
-- 
cgit v1.2.1