summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-05-13 08:54:15 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-05-13 08:54:15 +0000
commit59a8f55a1f5a2cc9cd2da78912590f4218461857 (patch)
tree2261e4a1e0d3d0f0642452148047828809177c71
parentfdf45c7e3272a8b3f459cb848e102c8daf53f3c1 (diff)
downloadurpmi-59a8f55a1f5a2cc9cd2da78912590f4218461857.tar
urpmi-59a8f55a1f5a2cc9cd2da78912590f4218461857.tar.gz
urpmi-59a8f55a1f5a2cc9cd2da78912590f4218461857.tar.bz2
urpmi-59a8f55a1f5a2cc9cd2da78912590f4218461857.tar.xz
urpmi-59a8f55a1f5a2cc9cd2da78912590f4218461857.zip
The --priority-upgrade option wasn't overridable via the command-line
-rwxr-xr-xurpmi25
1 files changed, 15 insertions, 10 deletions
diff --git a/urpmi b/urpmi
index 8c8a111d..6d0f7802 100755
--- a/urpmi
+++ b/urpmi
@@ -332,7 +332,10 @@ foreach (qw(post-clean verify-rpm)) {
}
exists $urpm->{options}{'split-level'} or $urpm->{options}{'split-level'} = $split_level;
exists $urpm->{options}{'split-length'} or $urpm->{options}{'split-length'} = $split_length;
-exists $urpm->{options}{'priority-ugrade'} or $urpm->{options}{'priority-upgrade'} = 'rpm,perl-URPM,urpmi';
+# comma-separated list of packages that should be installed first,
+# and that trigger an urpmi restart
+exists $urpm->{options}{'priority-upgrade'}
+ or $urpm->{options}{'priority-upgrade'} = 'rpm,perl-URPM,urpmi';
my $state = {};
my %requested = $urpm->register_rpms(@files, @src_files);
@@ -418,15 +421,17 @@ if ($parallel && $urpm::args::options{X}) {
#- handle parallel option if any.
#- return value is true if program should be restarted (in order to take care of important
#- packages being upgraded (problably urpmi and perl-URPM, but maybe rpm too, and glibc also ?).
-my $restart_itself = $urpm->resolve_dependencies($state, \%requested,
- rpmdb => $env && "$env/rpmdb.cz",
- auto_select => $auto_select,
- callback_choices => \&ask_choice,
- install_src => $install_src,
- keep => $urpm->{options}{keep},
- nodeps => $urpm->{options}{'allow-nodeps'} || $urpm->{options}{'allow-force'},
- priority_upgrade => !$test && !$env && $urpm->{options}{'priority-upgrade'},
- );
+my $restart_itself = $urpm->resolve_dependencies(
+ $state,
+ \%requested,
+ rpmdb => $env && "$env/rpmdb.cz",
+ auto_select => $auto_select,
+ callback_choices => \&ask_choice,
+ install_src => $install_src,
+ keep => $urpm->{options}{keep},
+ nodeps => $urpm->{options}{'allow-nodeps'} || $urpm->{options}{'allow-force'},
+ priority_upgrade => $test || $env ? '' : $urpm->{options}{'priority-upgrade'},
+);
my @ask_unselect = $urpm->unselected_packages($state);
if (@ask_unselect) {