summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-02-05 15:33:08 +0000
committerThierry Vignaud <tv@mandriva.org>2010-02-05 15:33:08 +0000
commit642dad5e9edc5027a2ce33d6f820968dbbe70e4d (patch)
tree3ee5f7c204c8afb3c038f2c7bd3841fb9a2d6e2e
parentf3009715df455d980262218aa9e152cbfdc739f1 (diff)
downloadmgaonline-642dad5e9edc5027a2ce33d6f820968dbbe70e4d.tar
mgaonline-642dad5e9edc5027a2ce33d6f820968dbbe70e4d.tar.gz
mgaonline-642dad5e9edc5027a2ce33d6f820968dbbe70e4d.tar.bz2
mgaonline-642dad5e9edc5027a2ce33d6f820968dbbe70e4d.tar.xz
mgaonline-642dad5e9edc5027a2ce33d6f820968dbbe70e4d.zip
(process_state) further fix notifying extended maintenance taking over
regular maintenance
-rw-r--r--NEWS4
-rwxr-xr-xmdkapplet3
2 files changed, 6 insertions, 1 deletions
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));