summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsetup.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index 402443ea..810ebb48 100755
--- a/setup.py
+++ b/setup.py
@@ -29,10 +29,20 @@ import setuptools
import subprocess
-def tiny_p(cmd):
- sp = subprocess.Popen(cmd, stdout=subprocess.PIPE,
- stderr=subprocess.PIPE, stdin=None)
+
+def tiny_p(cmd, capture=True):
+ # Darn python 2.6 doesn't have check_output (argggg)
+ stdout = subprocess.PIPE
+ stderr = subprocess.PIPE
+ if not capture:
+ stdout = None
+ stderr = None
+ sp = subprocess.Popen(cmd, stdout=stdout,
+ stderr=stderr, stdin=None)
(out, err) = sp.communicate()
+ if sp.returncode not in [0]:
+ raise RuntimeError("Failed running %s [rc=%s] (%s, %s)"
+ % (cmd, sp.returncode, out, err))
return (out, err)