Skip to content

Fix an UnboundLocalError if a compiler fails. #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 22, 2016
Merged

Fix an UnboundLocalError if a compiler fails. #541

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0937f1
Fix an UnboundLocalError if a compiler fails.
davidt Feb 17, 2016
d0d53a4
Update to avoid merge conflicts with PR #531.
davidt Feb 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pipeline/compilers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
else:
argument_list.extend(flattening_arg)

stdout = None
try:
# We always catch stdout in a file, but we may not have a use for it.
temp_file_container = cwd or os.path.dirname(stdout_captured or "") or os.getcwd()
Expand All @@ -135,7 +136,8 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
raise CompilerError(e)
finally:
# Decide what to do with captured stdout.
if stdout_captured:
os.rename(stdout.name, os.path.join(cwd or os.curdir, stdout_captured))
else:
os.remove(stdout.name)
if stdout:
if stdout_captured:
os.rename(stdout.name, os.path.join(cwd or os.curdir, stdout_captured))
else:
os.remove(stdout.name)