From c8bfa4cb4926651c7706da8cd141149e0ad505a9 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 25 Feb 2008 15:03:33 +0000
Subject: - urpmi   o --test: only display "Installation is possible" when it
 is the case (#29837)

---
 NEWS              | 1 +
 urpm/main_loop.pm | 8 ++++----
 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";
 	}
     }
 }
-- 
cgit v1.2.1