aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-06 17:40:29 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-06 17:40:29 +0000
commit2e1872f95b808a8b970fee4d3555f7652b7e9090 (patch)
treedfc1db7b9020055fe198bdfbf91740c4a2de75e4
parent911a5d03f3cc56e5cec1b507a6223ed99155f288 (diff)
downloadrpmdrake-2e1872f95b808a8b970fee4d3555f7652b7e9090.tar
rpmdrake-2e1872f95b808a8b970fee4d3555f7652b7e9090.tar.gz
rpmdrake-2e1872f95b808a8b970fee4d3555f7652b7e9090.tar.bz2
rpmdrake-2e1872f95b808a8b970fee4d3555f7652b7e9090.tar.xz
rpmdrake-2e1872f95b808a8b970fee4d3555f7652b7e9090.zip
(run_rpm) backport fixing setting locale to UTF-8 while running rpm
-rw-r--r--Rpmdrake/pkg.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 97333113..71a025df 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -83,7 +83,7 @@ sub parse_compssUsers_flat() {
sub run_rpm {
foreach (qw(LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL)) {
- local $ENV{$_} = $ENV{$_} . '.UTF-8' if !/UTF-8/;
+ local $ENV{$_} = $ENV{$_} . '.UTF-8' if $ENV{$_} && $ENV{$_} !~ /UTF-8/;
}
my @l = `@_`;
wantarray() ? @l : join('', @l);