From 28dc8e689f1ce7b68f466091462cc1dfc0e8c6b6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 5 Feb 2010 15:33:12 +0000 Subject: (process_state) warn when extended maintenance is over --- NEWS | 1 + mdkapplet | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/NEWS b/NEWS index 2f21c990..b697ea69 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ o do not check for new distro when using extended maintenance o further fix notifying extended maintenance taking over regular maintenance + o warn when extended maintenance is over Version 2.77.15.15 - 4 February 2010, Thierry Vignaud diff --git a/mdkapplet b/mdkapplet index 362c0a8a..9d7ebb37 100755 --- a/mdkapplet +++ b/mdkapplet @@ -145,6 +145,11 @@ my %state = ( menu => [], tt => [ N_("Release not supported (too old release, or development release)") ] }, + end_of_extended_support => { + colour => [ 'disabled' ], + menu => [], + tt => [ get_obsolete_message_() ] + }, no_update_medium => { colour => [ 'noconf' ], menu => [ 'check' ], @@ -385,6 +390,9 @@ sub process_state { 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'); setVar('EXTENDED_SUPPORT_SPLASHED', bool2yesno(1)); + # FIXME: just drop this state once upgrade from 2009.0 has been tested: + } elsif (is_extmaint_supported() && !is_extended_support_not_ended()) { + go2State('end_of_extended_support'); } elsif ($new_distro && is_false($config{DO_NOT_ASK_FOR_DISTRO_UPGRADE}) && is_false($local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE})) { go2State('new_distribution'); -- cgit v1.2.1