From c2c124f216c0184c5c145eb8e403369937fe7aa6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 3 May 2007 14:56:39 +0000
Subject: display "In order to satisfy the '%s' dependency, one of the
 following packages is needed:" so that user can understand what dependency is
 used (as suggested by Guillaume Rousse on cooker)

---
 NEWS  | 2 ++
 urpmi | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 2c581a9b..a3117439 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@
   o display "removing package ..." when removing, not before.
   o display "removing package ..." when upgrading package
     (may be too verbose though)
+  o display "In order to satisfy the '%s' dependency, one of the following
+    packages is needed:" so that user can understand what dependency is used
 - for rpmdrake
   o make translate_why_removed() safe to call (cf bug #28613)
 
diff --git a/urpmi b/urpmi
index 6249ae4c..e80753be 100755
--- a/urpmi
+++ b/urpmi
@@ -428,7 +428,7 @@ if (@src_names) {
 }
 
 sub ask_choice {
-    my ($urpm, $_db, $_state, $choices) = @_;
+    my ($urpm, $_db, $_state, $choices, $virtual_pkg_name) = @_;
     my $n = 1; #- default value.
     my (@l) = map {
 	my ($name, $summary) = (scalar($_->fullname), translate($_->summary));
@@ -444,7 +444,7 @@ sub ask_choice {
     } @$choices;
 
     if (@l > 1 && !$urpm->{options}{auto}) {
-	print N("One of the following packages is needed:"), "\n";
+	print N("In order to satisfy the '%s' dependency, one of the following packages is needed:", $virtual_pkg_name), "\n";
 	my $i = 0;
 	foreach (@l) { print " " . ++$i . "- $_\n" }
 	$n = message_input(N("What is your choice? (1-%d) ", $i), undef, range_min => 0, range => $i);
-- 
cgit v1.2.1