summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rwxr-xr-xmdkapplet2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 8367f19a..c1314dd0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
- mdkapplet
o run gurpmi with --expect-install option (make sure we know if
there was a failure)
+ o run gurpmi with --replacefiles option (so that temporary file
+ conflicts doesn't break upgrade due to missing conflict tags)
Version 2.50 - 6 October 2008
diff --git a/mdkapplet b/mdkapplet
index 6ef49495..81679aa0 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -427,7 +427,7 @@ sub upgrade() {
$refork_gurpmi = 1;
# we cannot use installUpdates() as MandrivaUpdate needs the media
# flaged as update (or else, we need to add a new option to MandrivaUpdate):
- fork_gurpmi();
+ fork_gurpmi('--replacefiles');
}
sub fork_gurpmi {