diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | mgaapplet-upgrade-helper | 13 |
2 files changed, 4 insertions, 10 deletions
@@ -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() { |