From 1c4c63428babc7de4542764bffa77f8a0c2c6955 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Mon, 25 Aug 2014 16:25:32 -0700 Subject: [PATCH] salt/utils/process.py: fix order of args to os.kill() Fixes: #15269 Signed-off-by: Dan Mick --- salt/utils/process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/utils/process.py b/salt/utils/process.py index 101ef033e9..e5e2855adc 100644 --- a/salt/utils/process.py +++ b/salt/utils/process.py @@ -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()