From 642dad5e9edc5027a2ce33d6f820968dbbe70e4d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 5 Feb 2010 15:33:08 +0000 Subject: (process_state) further fix notifying extended maintenance taking over regular maintenance --- NEWS | 4 ++++ mdkapplet | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index e4c3973a..e030a76d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +- mdkapplet + o further fix notifying extended maintenance taking over regular + maintenance + Version 2.77.15.15 - 4 February 2010, Thierry Vignaud - mdkapplet diff --git a/mdkapplet b/mdkapplet index 599af84e..7b0138cb 100755 --- a/mdkapplet +++ b/mdkapplet @@ -367,7 +367,8 @@ sub process_state { && !text2bool($config{EXTENDED_SUPPORT}) && !text2bool($local_config{EXTENDED_SUPPORT_OFFERED})) { go2State('no_more_supported'); - } elsif (text2bool($config{EXTENDED_SUPPORT}) && is_extmaint_supported() + } elsif ($current_apimdv_distro->{obsoleted_by} && 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)); -- cgit v1.2.1