Merging ns-3 into nepi-3-dev

[nepi.git] / src / nepi / util / execfuncs.py

diff --git a/src/nepi/util/execfuncs.py b/src/nepi/util/execfuncs.py
index b25ae98..d2da3ac 100644 (file)
--- a/src/nepi/util/execfuncs.py
+++ b/src/nepi/util/execfuncs.py
@@ -24,7 +24,6 @@ import subprocess
 def lexec(command, 
         user = None, 
         sudo = False,
-        stdin = None,
         env = None):
     """
     Executes a local command, returns ((stdout,stderr),process)
@@ -41,13 +40,12 @@ def lexec(command,
         command = "su %s ; %s " % (user, command)
 
 
-    p = subprocess.Popen(command, 
+    proc = subprocess.Popen(command, shell=True, 
             stdout = subprocess.PIPE, 
-            stderr = subprocess.PIPE,
-            stdin  = stdin)
+            stderr = subprocess.PIPE)
 
-    out, err = p.communicate()
-    return (out, err)
+    out, err = proc.communicate()
+    return ((out, err), proc)
 
 def lcopy(source, dest, recursive = False):
     """
@@ -71,11 +69,11 @@ def lcopy(source, dest, recursive = False):
 
     args.extend(dest)
 
-    p = subprocess.Popen(command, 
+    proc = subprocess.Popen(command, 
         stdout=subprocess.PIPE, 
         stderr=subprocess.PIPE)
 
-    out, err = p.communicate()
+    out, err = proc.communicate()
     return ((out, err), proc)
    
 def lspawn(command, pidfile, 
@@ -135,12 +133,12 @@ def lspawn(command, pidfile,
             'create' : 'mkdir -p %s ; ' % (shell_escape(home),) if create_home else '',
         }
 
-    (out,err),proc = lexec(cmd)
+    (out,err), proc = lexec(cmd)
     
     if proc.wait():
         raise RuntimeError, "Failed to set up application on host %s: %s %s" % (host, out,err,)
 
-    return (out,err),proc
+    return ((out,err), proc)
 
 def lgetpid(pidfile):
     """
@@ -155,7 +153,7 @@ def lgetpid(pidfile):
         or None if the pidfile isn't valid yet (maybe the process is still starting).
     """
 
-    (out,err),proc = lexec("cat %s" % pidfile )
+    (out,err), proc = lexec("cat %s" % pidfile )
         
     if proc.wait():
         return None
@@ -179,7 +177,7 @@ def lstatus(pid, ppid):
         One of NOT_STARTED, RUNNING, FINISHED
     """
 
-    (out,err),proc = lexec(
+    (out,err), proc = lexec(
         # Check only by pid. pid+ppid does not always work (especially with sudo) 
         " (( ps --pid %(pid)d -o pid | grep -c %(pid)d && echo 'wait')  || echo 'done' ) | tail -n 1" % {
             'ppid' : ppid,
@@ -194,8 +192,8 @@ def lstatus(pid, ppid):
         status = (out.strip() == 'wait')
     else:
         return ProcStatus.NOT_STARTED
+
     return ProcStatus.RUNNING if status else ProcStatus.FINISHED
- 
 
 def lkill(pid, ppid, sudo = False):
     """