From 283ef36a539f044c92cd676e6d734418985f0c4c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 30 Sep 2008 17:33:00 +0000
Subject: (is_there_a_new_distributions) better check in order to exclude
 cooker from distro upgrade

rationale: older/unsupported distro aren't in the list as well as
cooker (2009.1 won't be in the list)
---
 NEWS      | 1 +
 mdkapplet | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 09431d7d..3143f827 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 - mdkapplet
   o add support for downloading distro list as user for 2008.1
+  o better check in order to exclude cooker from distro upgrade
 
 Version 2.43 - 30 September 2008
 
diff --git a/mdkapplet b/mdkapplet
index 291c80eb..73cf5ef6 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -261,12 +261,6 @@ sub is_there_a_new_distributions() {
     my $list = "http://api.mandriva.com/distributions/$type.$product_id->{arch}.list?product=$product_id->{product}";
     log::explanations("trying distributions list from $list");
 
-    # sanity check for cooker:
-    if ($product_id->{branch} eq 'Devel') {
-        log::explanations("devel distribution is not supported");
-        return;
-    }
-
     my @lines = eval {
         my $urpm = Rpmdrake::open_db::fast_open_urpmi_db();
         if (member($product_id->{version}, qw(2007.1 2008.0 2008.1))) {
@@ -293,6 +287,8 @@ sub is_there_a_new_distributions() {
     # then it's the most recent release:
     my $new_distro = $distros[0];
 
+    return if !member($product_id->{version}, map { $_->{version} } @distros);
+
     if ($new_distro && $new_distro->{version} ne $product_id->{version}) {
         $new_distro_version = $new_distro->{version};
         log::explanations(sprintf("new '%s' distribution was released on %s", $new_distro_version, $new_distro->{release_date}));
-- 
cgit v1.2.1