summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-25 15:03:33 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-25 15:03:33 +0000
commitc8bfa4cb4926651c7706da8cd141149e0ad505a9 (patch)
tree00cb611fc7cdad8a95acd2e45571471657a3fdd0
parent1126918af32ca283ba5ef37dd9a189c2abc011c9 (diff)
downloadurpmi-c8bfa4cb4926651c7706da8cd141149e0ad505a9.tar
urpmi-c8bfa4cb4926651c7706da8cd141149e0ad505a9.tar.gz
urpmi-c8bfa4cb4926651c7706da8cd141149e0ad505a9.tar.bz2
urpmi-c8bfa4cb4926651c7706da8cd141149e0ad505a9.tar.xz
urpmi-c8bfa4cb4926651c7706da8cd141149e0ad505a9.zip
- urpmi
o --test: only display "Installation is possible" when it is the case (#29837)
-rw-r--r--NEWS1
-rw-r--r--urpm/main_loop.pm8
2 files changed, 5 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 4bd26a01..7d8eaccb 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@
o handle variables $ARCH/$RELEASE in mirrorlist
- urpmi:
o do not say "files are missing" when the downloaded rpm is corrupted
+ o --test: only display "Installation is possible" when it is the case (#29837)
Version 5.5 - 23 February 2008, by Pascal "Pixel" Rigaux
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index fb64d963..9cdc5872 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -276,10 +276,7 @@ if ($nok) {
}
} else {
$callbacks->{success_summary} and $callbacks->{success_summary}->();
- if ($test) {
- #- Warning : the following message is parsed in urpm::parallel_*
- print N("Installation is possible"), "\n";
- } elsif ($something_was_to_be_done || $auto_select) {
+ if ($something_was_to_be_done || $auto_select) {
if (@{$state->{transaction} || []} == 0 && @$ask_unselect == 0) {
if ($options{verbose} >= 0) {
if ($auto_select) {
@@ -302,6 +299,9 @@ if ($nok) {
}
}
$exit_code = 15 if our $expect_install;
+ } elsif ($test && $exit_code == 0) {
+ #- Warning : the following message is parsed in urpm::parallel_*
+ print N("Installation is possible"), "\n";
}
}
}