valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

communicate() first returns stdout not stderr.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-08-22 11:16:23 +01:00
parent d4ac22797c
commit 5bfcbdb914
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/nb_popen.py
View File

@ -211,6 +211,6 @@ class NonBlockingPopen(subprocess.Popen):
self.stderr_buff.flush()
self.stderr_buff.seek(0)
if self.universal_newlines:
return (self._translate_newlines(self.stderr_buff.read()),
self._translate_newlines(self.stdout_buff.read()))
return self.stderr_buff.read(), self.stdout_buff.read()
return (self._translate_newlines(self.stdout_buff.read()),
self._translate_newlines(self.stderr_buff.read()))
return self.stdout_buff.read(), self.stderr_buff.read()