Merge branch 'develop'

mytardis · May 3, 2017 · b8a8b0a · b8a8b0a
2 parents a407493 + 9534266
commit b8a8b0a
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/mydata/utils/openssh.py b/mydata/utils/openssh.py
@@ -218,6 +218,7 @@ def ReadFingerprintAndKeyType(self):
             cmdList = [OPENSSH.sshKeyGen, "-yl", "-f", self.privateKeyFilePath]
         logger.debug(" ".join(cmdList))
         proc = subprocess.Popen(cmdList,
+                                stdin=subprocess.PIPE,
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.STDOUT,
                                 startupinfo=DEFAULT_STARTUP_INFO,
@@ -299,6 +300,7 @@ def NewKeyPair(keyName=None, keyPath=None, keyComment=None):
     cmd = " ".join(cmdList)
     logger.debug(cmd)
     proc = subprocess.Popen(cmd,
+                            stdin=subprocess.PIPE,
                             stdout=subprocess.PIPE,
                             stderr=subprocess.STDOUT,
                             shell=True,
@@ -344,6 +346,7 @@ def SshServerIsReady(username, privateKeyFilePath,
     logger.debug(cmdString)
     proc = subprocess.Popen(cmdString,
                             shell=OPENSSH.preferToUseShellInSubprocess,
+                            stdin=subprocess.PIPE,
                             stdout=subprocess.PIPE,
                             stderr=subprocess.STDOUT,
                             startupinfo=DEFAULT_STARTUP_INFO,
@@ -468,6 +471,7 @@ def UploadFileFromPosixSystem(filePath, fileSize, username, privateKeyFilePath,
             mkdirProcess = \
                 subprocess.Popen(mkdirCmdString,
                                  shell=OPENSSH.preferToUseShellInSubprocess,
+                                 stdin=subprocess.PIPE,
                                  stdout=subprocess.PIPE,
                                  stderr=subprocess.STDOUT,
                                  startupinfo=DEFAULT_STARTUP_INFO,
@@ -510,6 +514,7 @@ def UploadFileFromPosixSystem(filePath, fileSize, username, privateKeyFilePath,
         scpUploadProcess = subprocess.Popen(
             scpCommandString,
             shell=OPENSSH.preferToUseShellInSubprocess,
+            stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             startupinfo=DEFAULT_STARTUP_INFO,
@@ -590,6 +595,7 @@ def UploadFileFromWindows(filePath, fileSize, username,
         mkdirProcess = \
             subprocess.Popen(mkdirCmdString,
                              shell=OPENSSH.preferToUseShellInSubprocess,
+                             stdin=subprocess.PIPE,
                              stdout=subprocess.PIPE,
                              stderr=subprocess.STDOUT,
                              startupinfo=DEFAULT_STARTUP_INFO,
@@ -624,6 +630,7 @@ def UploadFileFromWindows(filePath, fileSize, username,
     logger.debug(scpCommandString)
     scpUploadProcess = subprocess.Popen(
         scpCommandString,
+        stdin=subprocess.PIPE,
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
         startupinfo=DEFAULT_STARTUP_INFO,