From cebe18f599829a09a4645663dbf6d21fb948df6b Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 16 Oct 2008 14:39:29 +0000
Subject: (upgrade) really prevent upgrading more than once at a time

---
 mdkapplet | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'mdkapplet')

diff --git a/mdkapplet b/mdkapplet
index abe99543..dbddb3b6 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -373,11 +373,8 @@ sub confirm_upgrade() {
     $res;
 }
 
-my $already_in_upgrade;
 sub upgrade() {
-    return if $already_in_upgrade;
-    $already_in_upgrade = 1;
-    my $_a = before_leaving { undef $already_in_upgrade };
+    return if $mdv_update_pid;
     return if !confirm_upgrade();
     $mdv_update_pid = fork_exec('mdkapplet-upgrade-helper', "--new_distro_version=$new_distro->{version}",
                                 if_($root, "--urpmi-root=$root"));
-- 
cgit v1.2.1