summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-23 16:44:33 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-23 16:44:33 +0000
commit646b2e9b7cb668f708d824dcc739737a7e61d4b3 (patch)
tree890bfa9b09887c02acde774c17d6e02de4287e97
parent6c1b412b6039a3c4f28def612a685e1e7a1d931b (diff)
downloadurpmi-646b2e9b7cb668f708d824dcc739737a7e61d4b3.tar
urpmi-646b2e9b7cb668f708d824dcc739737a7e61d4b3.tar.gz
urpmi-646b2e9b7cb668f708d824dcc739737a7e61d4b3.tar.bz2
urpmi-646b2e9b7cb668f708d824dcc739737a7e61d4b3.tar.xz
urpmi-646b2e9b7cb668f708d824dcc739737a7e61d4b3.zip
- urpme:
o enhance pkg list formatting for "The following packages contain %s: %s" error message (#29178)
-rw-r--r--NEWS3
-rw-r--r--urpme5
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 26799d6c..f9ad8f16 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
- urpme, urpmi:
o add basesystem-minimal to prohibit-remove
+- urpme:
+ o enhance pkg list formatting for "The following packages contain %s: %s"
+ error message (#29178)
Version 5.2 - 18 January 2008, by Pascal "Pixel" Rigaux
diff --git a/urpme b/urpme
index 2df5d158..774fc343 100644
--- a/urpme
+++ b/urpme
@@ -102,9 +102,10 @@ my @toremove = urpm::select::find_packages_to_remove($urpm,
callback_fuzzy => sub {
my $urpm = shift @_;
my $match = shift @_;
+ my $pkgs = $urpm::msg::no_translation ? join(' ', @_) : join('', map { "\n$_" } sort @_);
#- Warning : the following message is parsed in urpm::parallel_*
- $urpm->{fatal}(1, N("The following packages contain %s: %s",
- $match, join(' ', @_))); 0 },
+ $urpm->{fatal}(1, N("The following packages contain %s: %s", $match, $pkgs));
+ 0 },
callback_base => sub {
my $urpm = shift @_;
foreach (@_) {