(is_extended_support_not_ended, is_there_a_new_distributions) do not

check for new distro when using extended maintenance

2 files changed, 13 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index e030a76d..2f21c990 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 - mdkapplet 
+  o do not check for new distro when using extended maintenance
   o further fix notifying extended maintenance taking over regular
     maintenance
 
diff --git a/mdkapplet b/mdkapplet
index 7b0138cb..362c0a8a 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -292,6 +292,14 @@ Gtk2->main;
 
 ugtk2::exit(0);
 
+sub is_extended_support_not_ended {
+    return if !is_extmaint_supported();
+    require POSIX;
+    my $d = POSIX::strftime("%G%m%d", localtime(time()));
+    $d < $extended_maintenance_end;
+}
+
+
 sub is_there_a_new_distributions() {
     # sanity check for cooker:
     # (2008.0 wrongly reports 'Devel' instead of 'Official'):
@@ -318,12 +326,15 @@ sub is_there_a_new_distributions() {
     refresh_no_more_supported_msg();
     if ($no_more_supported) {
         $new_distro = find { $_->{version} eq $no_more_supported } @distros;
-        return;
+        return if is_extended_support_not_ended();
     }
 
     # the "live upgrade" is not available on 2008.0:
     return if is_it_2008_0();
 
+    # no if we're using the extended maintenance:
+    return if is_extended_support_not_ended();
+
     if ($new_distribution && $new_distribution->{version} ne $product_id->{version}) {
         $new_distro = $new_distribution;
         log::explanations(sprintf("new '%s' distribution was released on %s", $new_distro->{version}, $new_distro->{release_date}));