lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix pexec('echo foo', shell=True)

Browse Source
This commit is contained in:
Bob Lantz
2012-05-16 23:59:12 -07:00
parent 2f8dfe5810
commit b91008345f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+5
View File
@@ -297,6 +297,8 @@ class Node( object ):
elif type( args[ 0 ] ) is str: elif type( args[ 0 ] ) is str:
# popen("cmd arg1 arg2...") # popen("cmd arg1 arg2...")
cmd = args[ 0 ].split() cmd = args[ 0 ].split()
else:
raise Exception( 'popen() requires a string or list' )
elif len( args ) > 0: elif len( args ) > 0:
# popen( cmd, arg1, arg2... ) # popen( cmd, arg1, arg2... )
cmd = args cmd = args
@@ -304,6 +306,9 @@ class Node( object ):
mncmd = defaults[ 'mncmd' ] mncmd = defaults[ 'mncmd' ]
del defaults[ 'mncmd' ] del defaults[ 'mncmd' ]
cmd = mncmd + cmd cmd = mncmd + cmd
# Shell requires a string, not a list!
if defaults.get( 'shell', False ):
cmd = ' '.join( cmd )
return Popen( cmd, **defaults ) return Popen( cmd, **defaults )
def pexec( self, *args, **kwargs ): def pexec( self, *args, **kwargs ):