Skip to content
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.

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

Fixes on cmd.py (fd leak and signal exception) #58

Merged
merged 2 commits into from
May 8, 2012
Merged
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions git/cmd.py
Original file line number Diff line number Diff line change
@@ -73,6 +73,9 @@ def __init__(self, proc, args ):
self.args = args

def __del__(self):
self.proc.stdout.close()
self.proc.stderr.close()

# did the process finish already so we have a return code ?
if self.proc.poll() is not None:
return
@@ -84,6 +87,8 @@ def __del__(self):
# try to kill it
try:
os.kill(self.proc.pid, 2) # interrupt signal
except OSError:
pass # ignore error when process already died
except AttributeError:
# try windows
# for some reason, providing None for stdout/stderr still prints something. This is why
@@ -100,6 +105,8 @@ def wait(self):

:raise GitCommandError: if the return status is not 0"""
status = self.proc.wait()
self.proc.stdout.close()
self.proc.stderr.close()
if status != 0:
raise GitCommandError(self.args, status, self.proc.stderr.read())
# END status handling