From 0965ac440bfce3230e3e8c47b4b8a36585d367db Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 17 Oct 2008 07:56:30 +0000 Subject: move things for next commit --- urpm/main_loop.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'urpm') diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm index 8ee82423..c9220a45 100644 --- a/urpm/main_loop.pm +++ b/urpm/main_loop.pm @@ -226,11 +226,12 @@ foreach my $set (@{$state->{transaction} || []}) { my ($raw_error, $translated) = partition { /^(badarch|bados|installed|badrelocate|conflicts|installed|diskspace|disknodes|requires|conflicts|unknown)\@/ } @l; @l = @$translated; my $fatal = grep { /^disk/ } @$raw_error; + my $no_question = $fatal || $urpm->{options}{auto}; #- Warning : the following message is parsed in urpm::parallel_* my $msg = N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l) . "\n"; my $retry; - if ($fatal || $urpm->{options}{auto} || !$urpm->{options}{'allow-nodeps'} && !$urpm->{options}{'allow-force'}) { + if ($no_question || !$urpm->{options}{'allow-nodeps'} && !$urpm->{options}{'allow-force'}) { print $msg; ++$urpm->{logger_id}; } else { -- cgit v1.2.1