proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-04-28 20:53:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add keeplocale parameter to run_command

Browse Source 
since the "lang" param has not worked, introduce a "keeplocale"
parameter instead.

the default behaviour is the same (set LC_ALL to 'C'), but we can use
the parameter to keep the locale from the host (eg. for the vncshell)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2017-02-28 12:06:35 +01:00 committed by Dietmar Maurer
parent a8e49285a5
commit 0f3f314ed7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PVE/Tools.pm
View File

@ -350,6 +350,7 @@ sub run_command {
my $output;
my $afterfork;
my $noerr;
my $keeplocale;
eval {
@ -374,6 +375,8 @@ sub run_command {
$afterfork = $param{$p};
} elsif ($p eq 'noerr') {
$noerr = $param{$p};
} elsif ($p eq 'keeplocale') {
$keeplocale = $param{$p};
} else {
die "got unknown parameter '$p' for run_command\n";
}
@ -397,13 +400,10 @@ sub run_command {
my $writer = $input && $input =~ m/^<&/ ? $input : IO::File->new();
my $error = IO::File->new();
# try to avoid locale related issues/warnings
my $lang = $param{lang} || 'C';
my $orig_pid = $$;
eval {
local $ENV{LC_ALL} = $lang;
local $ENV{LC_ALL} = 'C' if !$keeplocale;
# suppress LVM warnings like: "File descriptor 3 left open";
local $ENV{LVM_SUPPRESS_FD_WARNINGS} = "1";