From e9cf99bf1c2bfe51e66fc2329cb625ad4dd09d2b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 4 Feb 2010 17:03:31 +0000 Subject: (process_state) fix notifying extended maintenance taking over regular maintenance --- NEWS | 1 + mdkapplet | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index b0cc8f2f..c699b68f 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ - mdkapplet o advertize only once when has extended maintenance when regular one is expired + o fix notifying extended maintenance taking over regular maintenance Version 2.77.15.14 - 3 February 2010, Thierry Vignaud 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'); -- cgit v1.2.1