summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-16 14:39:29 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-16 14:39:29 +0000
commitcebe18f599829a09a4645663dbf6d21fb948df6b (patch)
treea7451189b517fdf35240e7405b91d7eed6c6a4c6
parent0fcb2c608d99eb90604c4aaae4ac253c53c55c80 (diff)
downloadmgaonline-cebe18f599829a09a4645663dbf6d21fb948df6b.tar
mgaonline-cebe18f599829a09a4645663dbf6d21fb948df6b.tar.gz
mgaonline-cebe18f599829a09a4645663dbf6d21fb948df6b.tar.bz2
mgaonline-cebe18f599829a09a4645663dbf6d21fb948df6b.tar.xz
mgaonline-cebe18f599829a09a4645663dbf6d21fb948df6b.zip
(upgrade) really prevent upgrading more than once at a time
-rw-r--r--NEWS3
-rwxr-xr-xmdkapplet5
2 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 446c3193..c2fded67 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- mdkapplet
+ o really prevent upgrading more than once at a time
+
Version 2.62 - 15 October 2008
- mdkapplet-upgrade-helper
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"));