diff options
| author | ivan <ivan> | 2012-02-12 01:40:14 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2012-02-12 01:40:14 +0000 |
| commit | 4fb5ec0a41aa2f9d2a580e8ab76e3a4aed986c44 (patch) | |
| tree | b182e3f2c972b18ffece1161085a68a2e79f3b96 /FS | |
| parent | eee6d96f68294389e3e1659e18a945ff2e5c47e5 (diff) | |
apply shellcommands ignored_errors regexen to STDOUT as well as STDERR, RT#15347
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/part_export/shellcommands.pm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm index edbe78f03..b3b7545c8 100644 --- a/FS/FS/part_export/shellcommands.pm +++ b/FS/FS/part_export/shellcommands.pm @@ -506,6 +506,8 @@ sub ssh_cmd { #subroutine, not method $output =~ s/$ignored_error//g; $errput =~ s/$ignored_error//g; } + $output =~ s/[\s\n]//g; + $errput =~ s/[\s\n]//g; chomp($output); chomp($errput); } |