sshbytestream: exited command always returns io.EOF

2017-05-06 23:44:59 +02:00
parent 82beea94d5
commit cb37470010
1 changed files with 3 additions and 7 deletions
@@ -116,7 +116,7 @@ func Outgoing(remote SSHTransport) (conn io.ReadWriteCloser, err error) {
 				WaitErr: err,
 			}
 		} else {
-			f.SSHCommandError = nil
+			f.SSHCommandError = io.EOF
 		}
 	}()

@@ -139,10 +139,8 @@ func (f *ForkedSSHReadWriteCloser) Read(p []byte) (n int, err error) {
 	if n, err = f.RemoteStdout.Read(p); err == io.EOF {
 		// the ssh command has exited, but we need to wait for post-portem to finish
 		f.exitWaitGroup.Wait()
-		if f.SSHCommandError != nil {
 		err = f.SSHCommandError
 	}
-	}
 	return
 }

@@ -153,10 +151,8 @@ func (f *ForkedSSHReadWriteCloser) Write(p []byte) (n int, err error) {
 	if n, err = f.RemoteStdin.Write(p); err == io.EOF {
 		// the ssh command has exited, but we need to wait for post-portem to finish
 		f.exitWaitGroup.Wait()
-		if f.SSHCommandError != nil {
 		err = f.SSHCommandError
 	}
-	}
 	return
 }