summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-09-01 10:50:21 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-09-01 10:50:21 +0000
commit6823eaff1667f593479ca8f986b5b90447d35e85 (patch)
treeacb4f4eba9fdde06cfcfc1be3efff0dc1220f1c3
parent54cf4db3a9a6c40b8671c454110792c491d64600 (diff)
downloadurpmi-6823eaff1667f593479ca8f986b5b90447d35e85.tar
urpmi-6823eaff1667f593479ca8f986b5b90447d35e85.tar.gz
urpmi-6823eaff1667f593479ca8f986b5b90447d35e85.tar.bz2
urpmi-6823eaff1667f593479ca8f986b5b90447d35e85.tar.xz
urpmi-6823eaff1667f593479ca8f986b5b90447d35e85.zip
Avoid another double encoding (nested N())
-rw-r--r--urpm.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index 95bc53d5..a987f765 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -861,7 +861,7 @@ sub select_media {
} elsif (@found == 0 && @foundi == 0) {
$urpm->{error}(N("trying to select nonexistent medium \"%s\"", $_));
} else { #- several elements in found and/or foundi lists.
- $urpm->{log}(N("selecting multiple media: %s", join(", ", map { N("\"%s\"", $_->{name}) } (@found ? @found : @foundi))));
+ $urpm->{log}(N("selecting multiple media: %s", join(", ", map { qq("$_->{name}") } (@found ? @found : @foundi))));
#- changed behaviour to select all occurences by default.
foreach (@found ? @found : @foundi) {
$_->{modified} = 1;
@@ -1594,7 +1594,8 @@ this could happen if you mounted manually the directory when creating the medium
if (-e "$urpm->{cachedir}/partial/$basename" && -s _ > 32 && $retrieved_md5sum) {
$urpm->{log}(N("computing md5sum of retrieved source hdlist (or synthesis)"));
unless (md5sum("$urpm->{cachedir}/partial/$basename") eq $retrieved_md5sum) {
- $urpm->{error}(N("...retrieving failed: %s", N("md5sum mismatch")));
+ #- XXX kludge. forced to do this to avoid double encoding under utf-8 locales, even with -CL
+ $urpm->{error}(N("...retrieving failed: ", "") . N("md5sum mismatch"));
unlink "$urpm->{cachedir}/partial/$basename";
}
}