summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-07 09:29:20 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-07 09:29:20 +0100
commitd83f6e84cbeb45dce4576a9a4591446afefa50b2 (patch)
tree9c2b7dc4254e76d91f6c85e3d53a2ce55ffdc32d /git
parenta4b8e467e44bc1ca1ebf481ac2dfc1baaf9688dc (diff)
downloadgitpython-d83f6e84cbeb45dce4576a9a4591446afefa50b2.tar.gz
Make sure we ignore WindowsErrors too, in case the process is already dead
Fixes #140
Diffstat (limited to 'git')
-rw-r--r--git/cmd.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git/cmd.py b/git/cmd.py
index 4a49bc1b..ef370fe2 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -103,7 +103,7 @@ class Git(LazyMixin):
try:
os.kill(self.proc.pid, 2) # interrupt signal
self.proc.wait() # ensure process goes away
- except OSError:
+ except (OSError, WindowsError):
pass # ignore error when process already died
except AttributeError:
# try windows