From 584e7e3db6cca674c460d6ae87449083d3b1054f Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 11 Jan 2008 11:09:36 +0000 Subject: better fix for "always prompt before doing a priority-upgrade transaction, even if there is only one priority upgrade package (since there will be more packages to install after restarting urpmi)" since we don't want to prompt if all pkgs have been especially prompted on command-line also not using suggests when selecting pkgs in priority-upgrade (nb: this may by-pass some suggests in priority-upgrade pkgs, need more checking) --- urpm/select.pm | 2 +- urpmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/urpm/select.pm b/urpm/select.pm index a3f46a4e..bc1ca996 100644 --- a/urpm/select.pm +++ b/urpm/select.pm @@ -257,7 +257,7 @@ sub resolve_dependencies { my %priority_state; - $urpm->resolve_requested($db, \%priority_state, $priority_requested, %options); + $urpm->resolve_requested__no_suggests_($db, \%priority_state, $priority_requested, %options); if (grep { ! exists $priority_state{selected}{$_} } keys %$priority_requested) { #- some packages which were selected previously have not been selected, strange! } elsif (grep { ! exists $priority_state{selected}{$_} } keys %$selected) { diff --git a/urpmi b/urpmi index 2a4551bb..eb8f3d4f 100755 --- a/urpmi +++ b/urpmi @@ -558,7 +558,7 @@ have to be removed for others to be upgraded:\n%s\n", $list); #- check if there is at least one package to install that #- has not been given by the user. -my $ask_user = $env || $search_result eq 'substring' || $restart_itself; +my $ask_user = $env || $search_result eq 'substring'; my @root_only; my @to_install = @{$urpm->{depslist}}[sort { $a <=> $b } keys %{$state->{selected}}]; # sorted by medium for format_selected_packages -- cgit v1.2.1