(get_stale_upgrade_filename,is_there_a_new_distributions,upgrade,upgrade_distro_congratulations)

be able to detect unfinished upgrades, even if mandriva-release
already got upgraded

3 files changed, 7 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index 0e5f4dd6..e817948a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 - mdkapplet
+  o be able to detect unfinished upgrades, even if mandriva-release
+    already got upgraded
   o confirmation dialog for system upgrade:
     * advise that it may take a couple hours
     * advise the need for high BW network
diff --git a/mdkapplet b/mdkapplet
index 4556fa71..3cc44639 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -264,6 +264,7 @@ 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 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-' : '';
diff --git a/mdkapplet-upgrade-helper b/mdkapplet-upgrade-helper
index 39c7dfa8..22d09abb 100755
--- a/mdkapplet-upgrade-helper
+++ b/mdkapplet-upgrade-helper
@@ -132,6 +132,8 @@ sub upgrade_failed() {
 }
 
 sub upgrade_distro_congratulations() {
+    rm_rf(get_stale_upgrade_filename());
+
     local $mygtk2::left_padding = 0;
     my $w = ugtk2->new(N("Congratulations"));
     gtkadd($w->{window},
@@ -179,6 +181,8 @@ packages as well?)."))
     }
     undef $urpmi_lock;
 
+    touch(get_stale_upgrade_filename());
+
     log::explanations("removing all existing urpmi media for upgrade");
     run_program::run('urpmi.removemedia', if_($root, '--urpmi-root', $root), '-a');