summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-05-23 17:56:49 (GMT)
committerEvan Martin <martine@danga.com>2012-05-23 17:56:49 (GMT)
commitb6664431cb5275389d6e25d5e29c67796b7281e7 (patch)
tree2431dc57a95d50c8b21434fb88dd73fba04e3959
parent1ff9ff485b23227046197251aa323df0869b0284 (diff)
parent69f9707e83c37543a517125cb231c78c01a665d0 (diff)
downloadNinja-b6664431cb5275389d6e25d5e29c67796b7281e7.zip
Ninja-b6664431cb5275389d6e25d5e29c67796b7281e7.tar.gz
Ninja-b6664431cb5275389d6e25d5e29c67796b7281e7.tar.bz2
Merge pull request #314 from ehird/master
Use subprocess.call for Python 2.4 compatibility
-rwxr-xr-xbootstrap.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/bootstrap.py b/bootstrap.py
index 1df423d..ad6f1eb 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -27,10 +27,9 @@ parser.add_option('--verbose', action='store_true',
(options, conf_args) = parser.parse_args()
def run(*args, **kwargs):
- try:
- subprocess.check_call(*args, **kwargs)
- except subprocess.CalledProcessError, e:
- sys.exit(e.returncode)
+ returncode = subprocess.call(*args, **kwargs)
+ if returncode != 0:
+ sys.exit(returncode)
# Compute system-specific CFLAGS/LDFLAGS as used in both in the below
# g++ call as well as in the later configure.py.