(is_there_a_new_distributions) further fix testing for

/var/lib/urpmi/stale_upgrade_in_progress: make sure 'new_distro' is
filled

2 files changed, 5 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 2ba36ebd..6cc467d1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 - mdkapplet
+  o further fix testing for /var/lib/urpmi/stale_upgrade_in_progress
   o make sure confirm dialog is large enough on 2008.1
   o use wizard button order in confirm dialog
 
diff --git a/mdkapplet b/mdkapplet
index 8558c0fc..5adf9d3f 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -266,7 +266,6 @@ ugtk2::exit(0);
 sub is_there_a_new_distributions() {
     $product_id = common::parse_LDAP_namespace_structure(cat_("$root/etc/product.id"));
     return if $product_id->{product} =~ /Flash/;
-    return 1 if -e get_stale_upgrade_filename();
     #- contact the following URL to retrieve the list of released distributions.
     my $type = lc($product_id->{type}); $type =~ s/\s//g;
     my $extra_path = $::testing || uc($config{TEST_DISTRO_UPGRADE}) eq 'YES' ? 'testing-' : '';
@@ -306,6 +305,10 @@ sub is_there_a_new_distributions() {
     # then it's the most recent release:
     my $new_distribution = $distros[0];
 
+    if (-e get_stale_upgrade_filename()) {
+        $new_distro = $new_distribution;
+        return 1;
+    }
     return if !member($product_id->{version}, map { $_->{version} } @distros);
 
     if ($new_distribution && $new_distribution->{version} ne $product_id->{version}) {