From 88732b694068704cb151e0c4256a8e8d1adaff38 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sat, 25 Feb 2017 10:23:39 +0100 Subject: fix(cmd): don't try to use TASKKILL on linux Fixes #576 --- git/cmd.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git/cmd.py b/git/cmd.py index 245a7f60..f8e0acce 100644 --- a/git/cmd.py +++ b/git/cmd.py @@ -254,14 +254,15 @@ class Git(LazyMixin): proc.terminate() proc.wait() # ensure process goes away except OSError as ex: - log.info("Ignored error after process has dies: %r", ex) + log.info("Ignored error after process had died: %r", ex) 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 # we simply use the shell and redirect to nul. Its slower than CreateProcess, question # is whether we really want to see all these messages. Its annoying no matter what. - call(("TASKKILL /F /T /PID %s 2>nul 1>nul" % str(proc.pid)), shell=True) + if is_win: + call(("TASKKILL /F /T /PID %s 2>nul 1>nul" % str(proc.pid)), shell=True) # END exception handling def __getattr__(self, attr): -- cgit v1.2.3