Repository: maven-wagon Updated Branches: refs/heads/master 5a8a63f6c -> 87338f924
Revert "[WAGON-465] Add ability to ignore errors sshexec errors" This reverts commit 5a8a63f6c425f0e572032a9ab64ae086047dfd88. Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/87338f92 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/87338f92 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/87338f92 Branch: refs/heads/master Commit: 87338f924f1e4c1194ee8c6afa6a97c85b344463 Parents: 5a8a63f Author: trand8 <dan.t...@emc.com> Authored: Fri Oct 28 23:07:09 2016 -0700 Committer: trand8 <dan.t...@emc.com> Committed: Fri Oct 28 23:07:09 2016 -0700 ---------------------------------------------------------------------- .../providers/ssh/jsch/AbstractJschWagon.java | 26 +++----------------- 1 file changed, 4 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/87338f92/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java index 8a9b4f3..9f51d90 100644 --- a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java +++ b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java @@ -305,7 +305,7 @@ public abstract class AbstractJschWagon } } - public Streams executeCommand( String command, boolean ignoreStdErr, boolean ignoreNoneZeroExitCode ) + public Streams executeCommand( String command, boolean ignoreFailures ) throws CommandExecutionException { ChannelExec channel = null; @@ -330,14 +330,9 @@ public abstract class AbstractJschWagon stderrReader.close(); stderrReader = null; - int exitCode = channel.getExitStatus(); - if ( streams.getErr().length() > 0 && !ignoreStdErr ) - { - throw new CommandExecutionException( "Exit code: " + exitCode + " - " + streams.getErr() ); - } - - if ( exitCode != 0 && !ignoreNoneZeroExitCode ) + if ( streams.getErr().length() > 0 && !ignoreFailures ) { + int exitCode = channel.getExitStatus(); throw new CommandExecutionException( "Exit code: " + exitCode + " - " + streams.getErr() ); } @@ -402,22 +397,9 @@ public abstract class AbstractJschWagon { fireTransferDebug( "Executing command: " + command ); - //backward compatible with wagon 2.10 - executeCommand( command, false, true ); + executeCommand( command, false ); } - - public Streams executeCommand( String command, boolean ignoreError ) - throws CommandExecutionException - { - fireTransferDebug( "Executing command: " + command ); - - //backward compatible with wagon 2.10 - return executeCommand( command, ignoreError, ignoreError ); - } - - - public InteractiveUserInfo getInteractiveUserInfo() { return this.interactiveUserInfo;
