summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-14 11:54:39 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-14 11:54:39 +0000
commit7865dd5b06c265731d925c92d2c67c5df0143212 (patch)
treec77779b65f4d7ea02b1aaa41de71d4d44037ffd6
parentc0bd8f72d9ad2e8c33b26159b475be41dd2cce20 (diff)
downloadmgaonline-7865dd5b06c265731d925c92d2c67c5df0143212.tar
mgaonline-7865dd5b06c265731d925c92d2c67c5df0143212.tar.gz
mgaonline-7865dd5b06c265731d925c92d2c67c5df0143212.tar.bz2
mgaonline-7865dd5b06c265731d925c92d2c67c5df0143212.tar.xz
mgaonline-7865dd5b06c265731d925c92d2c67c5df0143212.zip
(harvester,restart_applet,upgrade) do not restart the applet on
package update when performing distro upgrade
-rw-r--r--NEWS4
-rwxr-xr-xmdkapplet3
2 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 3badba67..5a886f80 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- mdkapplet
+ o do not restart the applet on package update when performing distro
+ upgrade
+
Version 2.58 - 14 October 2008
- mdkapplet
diff --git a/mdkapplet b/mdkapplet
index f9e279a5..8f31afbf 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -327,6 +327,7 @@ sub harvester {
my $status = $? >> 8;
if ($mdv_update_pid && $mdv_update_pid == $childpid) {
undef $mdv_update_pid;
+ undef $distro_upgrade;
$mdvupdate_returned = 1;
} elsif ($checker_pid && $checker_pid == $childpid) {
undef $checker_pid;
@@ -350,6 +351,7 @@ sub harvester {
sub configNetwork() { log::explanations(N_("Launching drakconnect\n")); fork_exec("/usr/sbin/drakconnect") }
sub restart_applet() {
+ return if $distro_upgrade;
log::explanations(N_("Mandriva Online seems to be reinstalled, reloading applet ...."));
exec($0, '--auto-update');
}
@@ -394,6 +396,7 @@ sub upgrade() {
$already_in_upgrade = 1;
my $_a = before_leaving { undef $already_in_upgrade };
return if !confirm_upgrade();
+ $distro_upgrade = 1;
$mdv_update_pid = fork_exec('mdkapplet-upgrade-helper', "--new_distro_version=$new_distro->{version}",
if_($root, "--urpmi-root=$root"));
}