summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-05-19 10:13:15 +0000
committerColin Guthrie <colin@mageia.org>2013-05-19 10:13:15 +0000
commit1921dc5d4396fe0e71bf0c34ebd26c09875b3f91 (patch)
tree39d47843d2f438c1d9cd4f3c85faa6637294e400
parent947178d6cf84d2da9c1462461ed0ee6dadd1cfe3 (diff)
downloadmgaonline-1921dc5d4396fe0e71bf0c34ebd26c09875b3f91.tar
mgaonline-1921dc5d4396fe0e71bf0c34ebd26c09875b3f91.tar.gz
mgaonline-1921dc5d4396fe0e71bf0c34ebd26c09875b3f91.tar.bz2
mgaonline-1921dc5d4396fe0e71bf0c34ebd26c09875b3f91.tar.xz
mgaonline-1921dc5d4396fe0e71bf0c34ebd26c09875b3f91.zip
Do not handle priority upgrades specially. This is now fixed in urpmi itself
-rw-r--r--NEWS1
-rwxr-xr-xmgaapplet-upgrade-helper13
2 files changed, 4 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index 3cba1d06..e9226fa3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- do not handle priority upgrades specially. This is now fixed in urpmi itself
- do not pass invalid --nocheck option to urpmi.update
Version 2.81 - 15 May 2013, Colin Guthrie
diff --git a/mgaapplet-upgrade-helper b/mgaapplet-upgrade-helper
index d2db06cd..a5f19e9b 100755
--- a/mgaapplet-upgrade-helper
+++ b/mgaapplet-upgrade-helper
@@ -99,15 +99,9 @@ sub run_gurpmi() {
my $succeeded_win = create_upgrade_succeeded_window();
my $failed_win = create_upgrade_failed_window();
- # Handle the priority upgrades first
- # We need to ensure the initial upgrade of rpm+urpmi is done in one
- # transaction (hense --split-length=0) as otherwise the rpmdb indexes can be
- # rebuilt with the wrong libdb version
- fork_gurpmi('--split-length=0', 'rpm', 'urpmi');
-
while ($refork_gurpmi) {
- my $ok = fork_gurpmi('--auto-select');
+ my $ok = fork_gurpmi();
if ($refork_gurpmi && !$ok) {
$refork_gurpmi--;
} else {
@@ -329,10 +323,9 @@ packages as well?)."))
sub fork_gurpmi {
run_program::raw({ timeout => 'never' },
- 'gurpmi', '>>', $log_file, '2>>', $log_file, '--auto', '--replacefiles', '--clean',
+ 'gurpmi', '>>', $log_file, '2>>', $log_file, '--auto', '--auto-select', '--replacefiles', '--clean',
if_($root, "--urpmi-root=$root"),
- if_($download_dir, "--download-all=$download_dir"),
- @_);
+ if_($download_dir, "--download-all=$download_dir"));
}
sub update_media() {