From b4bfc2535199e3c659aaad1d4990ae6290a72dcc Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Mon, 17 Jun 2002 15:44:07 +0000 Subject: 3.5-5mdk --- urpmi | 4 ++-- urpmi.spec | 6 +++++- urpmq | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/urpmi b/urpmi index e00a8fb7..7b52119b 100755 --- a/urpmi +++ b/urpmi @@ -343,12 +343,12 @@ my @to_install; #- check if there is at least one package to install that #- has not been given by the user. -my $ask_user = $env || $auto_select; +my $ask_user = $env; my $sum = 0; my @root_only; foreach my $pkg (sort { $a->name cmp $b->name } @{$urpm->{depslist}}[keys %{$state->{selected}}]) { - $ask_user ||= $pkg->flag_required; + $ask_user ||= $pkg->flag_required || $auto_select; my $fullname = $pkg->fullname; if (!$env && $uid > 0 && $pkg->arch ne 'src') { diff --git a/urpmi.spec b/urpmi.spec index 73bee505..83d85ba2 100644 --- a/urpmi.spec +++ b/urpmi.spec @@ -2,7 +2,7 @@ Name: urpmi Version: 3.5 -Release: 4mdk +Release: 5mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -144,6 +144,10 @@ fi %changelog +* Mon Jun 17 2002 François Pons 3.5-5mdk +- fixed urpmi --auto-select with no update and question asked. +- fixed urpmq --auto-select with error on HASH... + * Mon Jun 17 2002 François Pons 3.5-4mdk - fixed urpmq --headers on some cases. diff --git a/urpmq b/urpmq index e2b3982d..4c70eaff 100755 --- a/urpmq +++ b/urpmq @@ -156,7 +156,7 @@ if ($query->{auto_select} || $query->{deps}) { $urpm->resolve_packages_to_upgrade($db, $state, requested => 0); - if (%{$state->{ask_remove}} || %{$state->{ask_unselect}}) { + if (%{$state->{ask_remove} || {}} || %{$state->{ask_unselect} || {}}) { $urpm->{error}(_("some packages have to be removed for being upgraded, this is not supported yet\n")); } } -- cgit v1.2.1