summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-07-30 07:28:04 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-07-30 07:28:04 +0000
commit54de6421ceede207333bbb25b70f38c45c8f8d78 (patch)
tree3e8b13d1c653688d2ddb2daa1abe17d6047aa77d
parente3b6ff1f17df577b68f2ec8e7efabbeee827661e (diff)
downloadurpmi-54de6421ceede207333bbb25b70f38c45c8f8d78.tar
urpmi-54de6421ceede207333bbb25b70f38c45c8f8d78.tar.gz
urpmi-54de6421ceede207333bbb25b70f38c45c8f8d78.tar.bz2
urpmi-54de6421ceede207333bbb25b70f38c45c8f8d78.tar.xz
urpmi-54de6421ceede207333bbb25b70f38c45c8f8d78.zip
More information in the choice list
-rwxr-xr-xurpmi8
1 files 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 . "- $_") }