From: ivan <ivan>
Date: Sun, 12 Feb 2012 01:22:47 +0000 (+0000)
Subject: apply shellcommands ignored_errors regexen to STDOUT as well as STDERR, RT#15347
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=eee6d96f68294389e3e1659e18a945ff2e5c47e5

apply shellcommands ignored_errors regexen to STDOUT as well as STDERR, RT#15347
---

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 59146306d..edbe78f03 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -498,13 +498,18 @@ sub ssh_cmd { #subroutine, not method
   return if $opt->{'ignore_all_output'};
   die "Error running SSH command: ". $ssh->error if $ssh->error;
 
-  if ($errput && $opt->{'ignored_errors'} && length($opt->{'ignored_errors'})) {
+  if ( ($output || $errput)
+       && $opt->{'ignored_errors'} && length($opt->{'ignored_errors'})
+  ) {
     my @ignored_errors = split('\n',$opt->{'ignored_errors'});
     foreach my $ignored_error ( @ignored_errors ) {
+        $output =~ s/$ignored_error//g;
         $errput =~ s/$ignored_error//g;
     }
+    chomp($output);
     chomp($errput);
   }
+
   die $errput if $errput;
   die $output if $output;
   '';