valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15493 from basepi/bp-15272

Browse Source 
Backport #15272 to 2014.7
This commit is contained in:
Thomas S Hatch 2014-09-04 11:05:58 -06:00
commit 9f8683701e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/utils/process.py
View File

@ -89,7 +89,7 @@ def clean_proc(proc, wait_for_kill=10):
proc.pid
)
)
os.kill(signal.SIGKILL, proc.pid)
os.kill(proc.pid, signal.SIGKILL)
except (AssertionError, AttributeError):
# Catch AssertionError when the proc is evaluated inside the child
# Catch AttributeError when the process dies between proc.is_alive()