20 lines
787 B
Diff
20 lines
787 B
Diff
diff -rupN cobbler-2.0.7.old/koan/utils.py cobbler-2.0.7/koan/utils.py
|
|
--- cobbler-2.0.7.old/koan/utils.py 2015-01-12 13:33:54.809244930 -0500
|
|
+++ cobbler-2.0.7/koan/utils.py 2015-01-12 14:00:17.264594111 -0500
|
|
@@ -186,11 +186,10 @@ def subprocess_get_response(cmd, ignore_
|
|
rc = 0
|
|
result = ""
|
|
if not ANCIENT_PYTHON:
|
|
- try:
|
|
- result = sub_process.check_output(cmd).strip()
|
|
- except sub_process.CalledProcessError, e:
|
|
- rc = e.returncode
|
|
- result = e.output
|
|
+ p = sub_process.Popen(cmd, stdout=sub_process.PIPE, stderr=sub_process.STDOUT)
|
|
+ result, stderr = p.communicate()
|
|
+ result = result.strip()
|
|
+ rc = p.poll()
|
|
else:
|
|
cmd = string.join(cmd, " ")
|
|
print "cmdstr=(%s)" % cmd
|