# expected /proc/partitions format
import os, sys, shutil
-import popen2
+import subprocess
+import shlex
import socket
import fcntl
import string
"""
if VERBOSE_MODE:
print ("sysexec >>> %s" % cmd)
- prog= popen2.Popen4( cmd, 0 )
- if prog is None:
+
+ try:
+ prog = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ except OSError:
raise BootManagerException, \
- "Unable to create instance of popen2.Popen4 " \
+ "Unable to create instance of subprocess.Popen " \
"for command: %s" % cmd
+ (stdoutdata, stderrdata) = prog.communicate()
if log is not None:
- try:
- for line in prog.fromchild:
- log.write( line )
- except KeyboardInterrupt:
- raise BootManagerException, "Interrupted by user"
-
- returncode= prog.wait()
- # revert http://git.planet-lab.org/?p=bootmanager.git;a=commitdiff;h=cca3a2cd2096c0235dddb5982b1f05c8d4c7f916
- # as 256 returned by Python
- #
- ## cat test.py
- #import popen2
- #
- #cmd = "false"
- #prog = popen2.Popen4( cmd, 0 )
- #returncode = prog.wait()
- #print returncode
- #
- ## python test.py
- # 256
+ log.write(stdoutdata)
+
+ returncode = prog.wait()
if returncode != 0:
raise BootManagerException, "Running %s failed (rc=%d)" % (cmd,returncode)
- prog= None
+ prog = None
return 1