summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2012-02-12 01:40:16 +0000
committerivan <ivan>2012-02-12 01:40:16 +0000
commit96905d3cea83fb83ad59ddee55ab43be6600c812 (patch)
treef9dde3857db23025531f9b4c72a6117795b9987d
parentf67444281c6ca08af1463a987684d9223044f60a (diff)
apply shellcommands ignored_errors regexen to STDOUT as well as STDERR, RT#15347
-rw-r--r--FS/FS/part_export/shellcommands.pm2
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);
}