From 3605f0aba604ee14a4edd0ee496f92acc2d37306 Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Thu, 28 Apr 2011 16:22:18 +0200 Subject: [PATCH] rspawn.remote_kill fix: was not checking process status correctly --- src/nepi/testbeds/planetlab/rspawn.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nepi/testbeds/planetlab/rspawn.py b/src/nepi/testbeds/planetlab/rspawn.py index 6004462b..a1e0e43e 100644 --- a/src/nepi/testbeds/planetlab/rspawn.py +++ b/src/nepi/testbeds/planetlab/rspawn.py @@ -204,13 +204,13 @@ def remote_kill(pid, ppid, sudo = False, %(sudo)s kill %(pid)d for x in 1 2 3 4 5 6 7 8 9 0 ; do sleep 0.1 - if [ `ps --pid %(ppid)d -o pid | grep -c %(pid)d` == `0` ]; then + if [ `ps --ppid %(ppid)d -o pid | grep -c %(pid)d` == `0` ]; then break fi sleep 0.9 done -if [ `ps --pid %(ppid)d -o pid | grep -c %(pid)d` != `0` ]; then - %(sudo)s kill -9 %(pid)d %(ppid)d +if [ `ps --ppid %(ppid)d -o pid | grep -c %(pid)d` != `0` ]; then + %(sudo)s kill -9 %(pid)d fi """ % { 'ppid' : ppid, -- 2.47.0