diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2012-09-27 20:27:43 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2012-09-27 20:27:43 -0700 |
| commit | 3185fe4edea62dd3fa9818cf80902e96fe2a2d21 (patch) | |
| tree | 824a6cdb4b8ccc163127e00e1e86435b4c523476 /FS/FS/part_export/shellcommands.pm | |
| parent | f50a821d306b561d602edbdac0dac958b862ec0c (diff) | |
| parent | 39533c66139210655fc47404a17fd4e9b9ca8a00 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Conflicts:
FS/FS/cust_main/Billing.pm
Diffstat (limited to 'FS/FS/part_export/shellcommands.pm')
| -rw-r--r-- | FS/FS/part_export/shellcommands.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm index ca4e524..f964af3 100644 --- a/FS/FS/part_export/shellcommands.pm +++ b/FS/FS/part_export/shellcommands.pm @@ -490,7 +490,7 @@ sub ssh_cmd { #subroutine, not method my ($output, $errput) = $ssh->capture2($ssh_opt, $opt->{'command'}); return if $opt->{'ignore_all_errors'}; - die "Error running SSH command: ". $ssh->error if $ssh->error; + #die "Error running SSH command: ". $ssh->error if $ssh->error; if ( ($output || $errput) && $opt->{'ignored_errors'} && length($opt->{'ignored_errors'}) @@ -504,7 +504,9 @@ sub ssh_cmd { #subroutine, not method $errput =~ s/[\s\n]//g; } - die "$errput\n" if $errput; + die (($errput || $ssh->error). "\n") if $errput || $ssh->error; + #die "$errput\n" if $errput; + die "$output\n" if $output and $opt->{'fail_on_output'}; ''; } |