From 8971afc9e643826d4ad832dbc05f4a206ecfdd46 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 6 Oct 2008 14:09:11 +0000
Subject: enable to globally enable/disable new distribution check

---
 NEWS           | 1 +
 mdkapplet      | 3 ++-
 mdkapplet.conf | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 9e27aad1..d970cfbe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 - mdkapplet
+  o enable to globally enable/disable new distribution check
   o "Distro Upgrade" confirmation dialog:
     * display a banner
     * display an URL link button
diff --git a/mdkapplet b/mdkapplet
index 70a6fba4..0502b9ab 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -331,7 +331,8 @@ sub harvester {
             if ($state) {
                 logIt($state->{log});
                 $sub_state = $state->{status};
-                go2State($new_distro && $local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} !~ /^true$/i ?
+                go2State($new_distro && $config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} !~ /^true$/i ?
+                           && $local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} !~ /^true$/i ?
                            'new_distribution' : $sub_state);
             }
         } elsif ($media_manager_pid && $media_manager_pid == $childpid) {
diff --git a/mdkapplet.conf b/mdkapplet.conf
index 0caebfe4..6e093dc3 100644
--- a/mdkapplet.conf
+++ b/mdkapplet.conf
@@ -3,3 +3,8 @@ UPDATE_FREQUENCY=10800
 
 # Initial check will be delayed by (default to 5 minutes):
 FIRST_CHECK_DELAY=300000
+
+# Globally enable or disable check for new distribution
+# (in order to offer live distro upgrade):
+# (default is "false", meaning check will be done)
+DO_NOT_ASK_FOR_DISTRO_UPGRADE=false
\ No newline at end of file
-- 
cgit v1.2.1