summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-03 17:35:45 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-03 17:35:45 +0000
commit60de791955c6920a444e3942e91ab22fd4c19438 (patch)
treedb42d25e8db1be0729f4400c9f9828a8a2c11ea6
parent4806e45df2ddeb07821a7c6e92e6c4708dea550a (diff)
downloadurpmi-60de791955c6920a444e3942e91ab22fd4c19438.tar
urpmi-60de791955c6920a444e3942e91ab22fd4c19438.tar.gz
urpmi-60de791955c6920a444e3942e91ab22fd4c19438.tar.bz2
urpmi-60de791955c6920a444e3942e91ab22fd4c19438.tar.xz
urpmi-60de791955c6920a444e3942e91ab22fd4c19438.zip
Count failed transactions, so when displaying counter you don't get an
off-by-one error at the end if a transaction failed.
-rwxr-xr-xurpmi3
1 files changed, 3 insertions, 0 deletions
diff --git a/urpmi b/urpmi
index 66923bfe..e77a9161 100755
--- a/urpmi
+++ b/urpmi
@@ -694,6 +694,7 @@ foreach my $set (@{$state->{transaction} || []}) {
message(N("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l));
if ($urpm->{options}{auto} || !$urpm->{options}{'allow-nodeps'} && !$urpm->{options}{'allow-force'}) {
++$nok;
+ ++$urpm->{logger_id};
push @errors, @l;
} else {
my $noexpr = N("Nn");
@@ -713,6 +714,7 @@ foreach my $set (@{$state->{transaction} || []}) {
message(N("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l));
if (!$urpm->{options}{'allow-force'}) {
++$nok;
+ ++$urpm->{logger_id};
push @errors, @l;
} else {
message_input(N("Try harder to install (--force)? (y/N) "),
@@ -729,6 +731,7 @@ foreach my $set (@{$state->{transaction} || []}) {
#- Warning : the following message is parsed in urpm::parallel_*
message(N("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l));
++$nok;
+ ++$urpm->{logger_id};
push @errors, @l;
} else {
++$ok;