From b91008345fcce629786c3fa3eb1a3769f0e806e4 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Wed, 16 May 2012 23:59:12 -0700
Subject: [PATCH] Fix pexec('echo foo', shell=True)

---
 mininet/node.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mininet/node.py b/mininet/node.py
index c12ae08..d210e42 100644
--- a/mininet/node.py
+++ b/mininet/node.py
@@ -297,6 +297,8 @@ class Node( object ):
             elif type( args[ 0 ] ) is str:
                 # popen("cmd arg1 arg2...")
                 cmd = args[ 0 ].split()
+            else:
+                raise Exception( 'popen() requires a string or list' )
         elif len( args ) > 0:
             # popen( cmd, arg1, arg2... )
             cmd = args
@@ -304,6 +306,9 @@ class Node( object ):
         mncmd = defaults[ 'mncmd' ]
         del defaults[ 'mncmd' ]
         cmd = mncmd + cmd
+        # Shell requires a string, not a list!
+        if defaults.get( 'shell', False ):
+            cmd = ' '.join( cmd )
         return Popen( cmd, **defaults )
 
     def pexec( self, *args, **kwargs ):