diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-09-24 14:32:55 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-09-24 14:32:55 -0700 |
| commit | a345373110006c8f7f1a21498241b526053b40bc (patch) | |
| tree | 3f711e5be5aef6cb90e0721fee725e9b943f1813 | |
| parent | b138f0d293a32a7d7159c201281ff8f383491cca (diff) | |
make with statement in shared.py work in python 2.6
| -rw-r--r-- | tools/shared.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/shared.py b/tools/shared.py index 6595ee7c..700849e8 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -558,9 +558,10 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e return open(os.path.join(project_dir, 'make_err' + str(i)), mode) for i in range(2): # FIXME: Sad workaround for some build systems that need to be run twice to succeed (e.g. poppler) - with open_make_out(i, 'w') as make_out, open_make_err(i, 'w') as make_err: - Building.make(make + make_args, stdout=make_out, - stderr=make_err, env=env) + with open_make_out(i, 'w') as make_out: + with open_make_err(i, 'w') as make_err: + Building.make(make + make_args, stdout=make_out, + stderr=make_err, env=env) try: if cache is not None: cache[cache_name] = [] |