summaryrefslogtreecommitdiffstats
path: root/mdkapplet
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-02-04 17:03:31 +0000
committerThierry Vignaud <tv@mandriva.org>2010-02-04 17:03:31 +0000
commite9cf99bf1c2bfe51e66fc2329cb625ad4dd09d2b (patch)
tree0accdf5bcdea323289f934c3f45e407dba77c2c2 /mdkapplet
parenteb1c0a57ba4680bdedbae190db0951316a0a4f77 (diff)
downloadmgaonline-e9cf99bf1c2bfe51e66fc2329cb625ad4dd09d2b.tar
mgaonline-e9cf99bf1c2bfe51e66fc2329cb625ad4dd09d2b.tar.gz
mgaonline-e9cf99bf1c2bfe51e66fc2329cb625ad4dd09d2b.tar.bz2
mgaonline-e9cf99bf1c2bfe51e66fc2329cb625ad4dd09d2b.tar.xz
mgaonline-e9cf99bf1c2bfe51e66fc2329cb625ad4dd09d2b.zip
(process_state) fix notifying extended maintenance taking over regular maintenance
Diffstat (limited to 'mdkapplet')
-rwxr-xr-xmdkapplet5
1 files changed, 2 insertions, 3 deletions
diff --git a/mdkapplet b/mdkapplet
index 4638c1fa..cf947108 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -366,9 +366,8 @@ sub process_state {
} elsif ($no_more_supported && !text2bool($config{EXTENDED_SUPPORT})
&& !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()) {
+ } elsif (text2bool($config{EXTENDED_SUPPORT}) && is_extmaint_supported()
+ && !text2bool($local_config{EXTENDED_SUPPORT_SPLASHED})) {
$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');