summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-02-04 17:03:28 +0000
committerThierry Vignaud <tv@mandriva.org>2010-02-04 17:03:28 +0000
commiteb1c0a57ba4680bdedbae190db0951316a0a4f77 (patch)
treebbca69dca8f2b962b580b64d8d657753bc13c815
parent7b597cf0c80450f05977c46e64d50fb9e0568aa8 (diff)
downloadmgaonline-eb1c0a57ba4680bdedbae190db0951316a0a4f77.tar
mgaonline-eb1c0a57ba4680bdedbae190db0951316a0a4f77.tar.gz
mgaonline-eb1c0a57ba4680bdedbae190db0951316a0a4f77.tar.bz2
mgaonline-eb1c0a57ba4680bdedbae190db0951316a0a4f77.tar.xz
mgaonline-eb1c0a57ba4680bdedbae190db0951316a0a4f77.zip
(process_state) advertize only once when has extended maintenance when
regular one is expired (misplaced ")")
-rw-r--r--NEWS4
-rwxr-xr-xmdkapplet4
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index baf55a37..b0cc8f2f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- mdkapplet
+ o advertize only once when has extended maintenance when
+ regular one is expired
+
Version 2.77.15.14 - 3 February 2010, Thierry Vignaud
- mdkapplet-extended-maintenance-helper
diff --git a/mdkapplet b/mdkapplet
index 0bc6a06e..4638c1fa 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -367,8 +367,8 @@ sub process_state {
&& !text2bool($local_config{EXTENDED_SUPPORT_OFFERED})) {
go2State('no_more_supported');
} elsif ($no_more_supported && text2bool($config{EXTENDED_SUPPORT})
- && !text2bool($local_config{EXTENDED_SUPPORT_SPLASHED}
- && !is_extmaint_supported())) {
+ && !text2bool($local_config{EXTENDED_SUPPORT_SPLASHED})
+ && !is_extmaint_supported()) {
$state{extended_support_is_enabled}{tt}[0] =
N("Basic maintenance for this distribution has expired. Thanks to your subscription to extended maintenance, your system will be kept up to date until %s", iso8601_date_to_locale($extended_maintenance_end));
go2State('extended_support_is_enabled');