From 54de6421ceede207333bbb25b70f38c45c8f8d78 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Fri, 30 Jul 2004 07:28:04 +0000
Subject: More information in the choice list

---
 urpmi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/urpmi b/urpmi
index 2b0aaa54..32e6e682 100755
--- a/urpmi
+++ b/urpmi
@@ -390,13 +390,17 @@ if (@src_names) {
 sub ask_choice {
     my ($urpm, $db, $state, $choices) = @_;
     my $n = 1; #- default value.
-    my (@l) = map { scalar $_->fullname } @$choices;
+    my (@l) = map {
+	(scalar $_->fullname)
+	. ($_->flag_installed ? ' (to upgrade)' : '')
+	. ($_->flag_upgrade   ? ' (to install)' : '')
+    } @$choices;
 
     if (@l > 1 && !$urpm->{options}{auto}) {
 	my $msg = N("One of the following packages is needed:");
 	if ($urpm::args::options{X}) {
 	    system(qq(gchooser "$msg" @l));
-	    $n = $? >> 8 || die;
+	    $n = $? >> 8 or die "\n";
 	} else {
 	    message($msg);
 	    my $i = 0; foreach (@l) { message(" " . ++$i . "- $_") }
-- 
cgit v1.2.1