From 4fb5ec0a41aa2f9d2a580e8ab76e3a4aed986c44 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 12 Feb 2012 01:40:14 +0000 Subject: [PATCH] apply shellcommands ignored_errors regexen to STDOUT as well as STDERR, RT#15347 --- FS/FS/part_export/shellcommands.pm | 2 ++ 1 file changed, 2 insertions(+) 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); } -- 2.11.0