summaryrefslogtreecommitdiffstats
path: root/urpm/main_loop.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-17 07:56:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-17 07:56:30 +0000
commit0965ac440bfce3230e3e8c47b4b8a36585d367db (patch)
tree34f733998316adc4ab24e4f431335dd01b709724 /urpm/main_loop.pm
parent9c1a8705fe4ed83709d33b275947d4bab1f79a97 (diff)
downloadurpmi-0965ac440bfce3230e3e8c47b4b8a36585d367db.tar
urpmi-0965ac440bfce3230e3e8c47b4b8a36585d367db.tar.gz
urpmi-0965ac440bfce3230e3e8c47b4b8a36585d367db.tar.bz2
urpmi-0965ac440bfce3230e3e8c47b4b8a36585d367db.tar.xz
urpmi-0965ac440bfce3230e3e8c47b4b8a36585d367db.zip
move things for next commit
Diffstat (limited to 'urpm/main_loop.pm')
-rw-r--r--urpm/main_loop.pm3
1 files changed, 2 insertions, 1 deletions
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 {