From 620afaecf0832fa539afa13ae0844e5582fc85f6 Mon Sep 17 00:00:00 2001 From: harlowja Date: Tue, 26 Jun 2012 07:56:54 -0700 Subject: Copy the tiny_p from the packager code --- setup.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'setup.py') 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) -- cgit v1.2.3