X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fnode.py;h=01a1d40f7cf97be32e52ec259dff06adbc04ea1a;hb=2e80f0fafa0c2ef6a5f536efd4c868c91468f962;hp=8ad69f32fdaa4014a823b0901230e4047ab96eca;hpb=e0447bc7e91d169d6d88498981421572d939b6fb;p=nepi.git

diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py
index 8ad69f32..01a1d40f 100644
--- a/src/nepi/resources/linux/node.py
+++ b/src/nepi/resources/linux/node.py
@@ -418,15 +418,19 @@ class LinuxNode(ResourceManager):
                 pids_temp = dict()
                 ps_aux = "ps aux |awk '{print $2,$11}'"
                 (out, err), proc = self.execute(ps_aux)
-                for line in out.strip().split("\n"):
-                    parts = line.strip().split(" ")
-                    pids_temp[parts[0]] = parts[1]
-                kill_pids = set(pids_temp.items()) - set(pids.items())
-                kill_pids = ' '.join(dict(kill_pids).keys())
-
-                cmd = ("killall tcpdump || /bin/true ; " +
-                    "kill $(ps aux | grep '[n]epi' | awk '{print $2}') || /bin/true ; " +
-                    "kill %s || /bin/true ; " % kill_pids)
+                if len(out) != 0:
+                    for line in out.strip().split("\n"):
+                        parts = line.strip().split(" ")
+                        pids_temp[parts[0]] = parts[1]
+                    kill_pids = set(pids_temp.items()) - set(pids.items())
+                    kill_pids = ' '.join(dict(kill_pids).keys())
+
+                    cmd = ("killall tcpdump || /bin/true ; " +
+                        "kill $(ps aux | grep '[n]epi' | awk '{print $2}') || /bin/true ; " +
+                        "kill %s || /bin/true ; " % kill_pids)
+                else:
+                    cmd = ("killall tcpdump || /bin/true ; " +
+                        "kill $(ps aux | grep '[n]epi' | awk '{print $2}') || /bin/true ; ")
             else:
                 cmd = ("killall tcpdump || /bin/true ; " +
                     "kill $(ps aux | grep '[n]epi' | awk '{print $2}') || /bin/true ; ")
@@ -701,7 +705,8 @@ class LinuxNode(ResourceManager):
         if err:
             msg = " Failed to upload files - src: %s dst: %s" %  (";".join(src), dst) 
             self.error(msg, out, err)
-
+            
+            msg = "%s out: %s err: %s" % (msg, out, err)
             if raise_on_error:
                 raise RuntimeError, msg