Commit 2f017ac

committed

Avoid making it look like kill_process works on Windows

This changes the code in Git.execute's local kill_process function, which it uses as the timed callback for kill_after_timeout, to remove code that is unnecessary because kill_process doesn't support Windows, and to avoid giving the false impression that its code could be used unmodified on Windows without serious problems. - Raise AssertionError explicitly if it is called on Windows. This is done with "raise" rather than "assert" so its behavior doesn't vary depending on "-O". - Don't pass process creation flags, because they were 0 except on Windows. - Don't fall back to SIGTERM if Python's signal module doesn't know about SIGKILL. This was specifically for Windows which has no SIGKILL. See gitpython-developers#1756 for discussion.

1 parent f42a63b commit 2f017acCopy full SHA for 2f017ac

File tree

1 file changed

-11

lines changed

git
- cmd.py

1 file changed

-11

lines changed

`‎git/cmd.py‎`

Lines changed: 7 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1015,11 +1015,9 @@ def execute(`
`1015`	`1015`
`1016`	`1016`	`def kill_process(pid: int) -> None:`
`1017`	`1017`	`"""Callback to kill a process."""`
`1018`		`- p = Popen(`
`1019`		`- ["ps", "--ppid", str(pid)],`
`1020`		`- stdout=PIPE,`
`1021`		`- creationflags=PROC_CREATIONFLAGS,`
`1022`		`- )`
	`1018`	`+ if os.name == "nt":`
	`1019`	`+ raise AssertionError("Bug: This callback would be ineffective and unsafe on Windows, stopping.")`
	`1020`	`+ p = Popen(["ps", "--ppid", str(pid)], stdout=PIPE)`
`1023`	`1021`	`child_pids = []`
`1024`	`1022`	`if p.stdout is not None:`
`1025`	`1023`	`for line in p.stdout:`
`@@ -1028,18 +1026,16 @@ def kill_process(pid: int) -> None:`
`1028`	`1026`	`if local_pid.isdigit():`
`1029`	`1027`	`child_pids.append(int(local_pid))`
`1030`	`1028`	`try:`
`1031`		`- # Windows does not have SIGKILL, so use SIGTERM instead.`
`1032`		`- sig = getattr(signal, "SIGKILL", signal.SIGTERM)`
`1033`		`- os.kill(pid, sig)`
	`1029`	`+ os.kill(pid, signal.SIGKILL)`
`1034`	`1030`	`for child_pid in child_pids:`
`1035`	`1031`	`try:`
`1036`		`- os.kill(child_pid, sig)`
	`1032`	`+ os.kill(child_pid, signal.SIGKILL)`
`1037`	`1033`	`except OSError:`
`1038`	`1034`	`pass`
`1039`	`1035`	`kill_check.set() # Tell the main routine that the process was killed.`
`1040`	`1036`	`except OSError:`
`1041`		`- # It is possible that the process gets completed in the duration after timeout`
`1042`		`- # happens and before we try to kill the process.`
	`1037`	`+ # It is possible that the process gets completed in the duration after`
	`1038`	`+ # timeout happens and before we try to kill the process.`
`1043`	`1039`	`pass`
`1044`	`1040`	`return`
`1045`	`1041`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2f017ac

File tree

1 file changed

1 file changed

`‎git/cmd.py‎`

0 commit comments