From d491ce3929c5bb13042effa3c4aef0428a31c561 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 22 Jul 2009 10:19:34 +0000
Subject: (upgrade) remove the "upgrade in progress" flag when adding media
 failed (might fix #50450)

---
 NEWS                     | 3 +++
 mdkapplet-upgrade-helper | 1 +
 2 files changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 2e966eb0..f5f6c7a6 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@
   o on MES5, offer to add update media from authenticated server
   o if current distribution is no more supported, warn so and offer to
     upgrade to latest release
+- mdkapplet-upgrade-helper
+  o remove the "upgrade in progress" flag when adding media failed
+    (might fix #50450)
 
 Version 2.77.1 - 12 May 2009, Thierry Vignaud
 
diff --git a/mdkapplet-upgrade-helper b/mdkapplet-upgrade-helper
index 22d09abb..f7ba00c3 100755
--- a/mdkapplet-upgrade-helper
+++ b/mdkapplet-upgrade-helper
@@ -202,6 +202,7 @@ packages as well?)."))
 
     system('gurpmi.addmedia', '--silent-success', if_($root, "--urpmi-root=$root"), '--distrib', '--mirrorlist', '$MIRRORLIST') and do {
         log::explanations("adding media for new distribution failed");
+        rm_rf(get_stale_upgrade_filename());
         log::explanations("restoringing urpmi configuration from $file");
         cp_af($file, "$root/etc/urpmi/urpmi.cfg");
         update_media();
-- 
cgit v1.2.1