Dev: Tools: crm: make get_stdin show stderr output

Mercurial revision: cb622d4a2120fa65f1434acb55495859af32ba6d
ClusterLabs · Aug 26, 2009 · 18a32f3 · 18a32f3
1 parent 33ffdd0
commit 18a32f3
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/tools/crm.in b/tools/crm.in
@@ -945,9 +945,12 @@ def get_stdin(cmd, stderr_on = True):
     Run a cmd, return stdin output.
     stderr_on controls whether to show output which comes on stderr.
     '''
-    proc = subprocess.Popen(cmd, shell=True, \
-        stdout=subprocess.PIPE, \
-        stderr=stderr_on and None or subprocess.PIPE)
+    if stderr_on:
+        stderr = None
+    else:
+        stderr = subprocess.PIPE
+    proc = subprocess.Popen(cmd, shell = True, \
+        stdout = subprocess.PIPE, stderr = stderr)
     outp = proc.communicate()[0]
     proc.wait()
     outp = outp.strip()