Commit88732b6

committed

fix(cmd): don't try to use TASKKILL on linux

1 parentfdc8ecb commit88732b6Copy full SHA for 88732b6

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -254,14 +254,15 @@ def __del__(self):`
`254`	`254`	`proc.terminate()`
`255`	`255`	`proc.wait()# ensure process goes away`
`256`	`256`	`exceptOSErrorasex:`
`257`		`-log.info("Ignored error after processhas dies: %r",ex)`
	`257`	`+log.info("Ignored error after processhad died: %r",ex)`
`258`	`258`	`pass# ignore error when process already died`
`259`	`259`	`exceptAttributeError:`
`260`	`260`	`# try windows`
`261`	`261`	`# for some reason, providing None for stdout/stderr still prints something. This is why`
`262`	`262`	`# we simply use the shell and redirect to nul. Its slower than CreateProcess, question`
`263`	`263`	`# is whether we really want to see all these messages. Its annoying no matter what.`
`264`		`-call(("TASKKILL /F /T /PID %s 2>nul 1>nul"%str(proc.pid)),shell=True)`
	`264`	`+ifis_win:`
	`265`	`+call(("TASKKILL /F /T /PID %s 2>nul 1>nul"%str(proc.pid)),shell=True)`
`265`	`266`	`# END exception handling`
`266`	`267`
`267`	`268`	`def__getattr__(self,attr):`

Comments

(0)