summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-07-22 10:19:34 +0000
committerThierry Vignaud <tv@mandriva.org>2009-07-22 10:19:34 +0000
commitd491ce3929c5bb13042effa3c4aef0428a31c561 (patch)
tree294a95afdfa726c7bf7f939c408f74211e532275
parent00cbc17fa349dfa780e9b7a37a868ea212113b73 (diff)
downloadmgaonline-d491ce3929c5bb13042effa3c4aef0428a31c561.tar
mgaonline-d491ce3929c5bb13042effa3c4aef0428a31c561.tar.gz
mgaonline-d491ce3929c5bb13042effa3c4aef0428a31c561.tar.bz2
mgaonline-d491ce3929c5bb13042effa3c4aef0428a31c561.tar.xz
mgaonline-d491ce3929c5bb13042effa3c4aef0428a31c561.zip
(upgrade) remove the "upgrade in progress" flag when adding media
failed (might fix #50450)
-rw-r--r--NEWS3
-rwxr-xr-xmdkapplet-upgrade-helper1
2 files changed, 4 insertions, 0 deletions
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();