code cleanup

[oweals/gnunet.git] / contrib / gnunet_pyexpect.py.in

diff --git a/contrib/gnunet_pyexpect.py.in b/contrib/gnunet_pyexpect.py.in
index 15d19fe5a6c002e5fbaa6747246664f4b17bae82..9e5c83fa37e66aca3eda47f5abce6da1b4f868b4 100644 (file)
--- a/contrib/gnunet_pyexpect.py.in
+++ b/contrib/gnunet_pyexpect.py.in
@@ -31,7 +31,12 @@ class pexpect (object):
     super (pexpect, self).__init__ ()\r
 \r
   def spawn (self, stdin, arglist, *pargs, **kwargs):\r
-    self.proc = subprocess.Popen (arglist, *pargs, **kwargs)\r
+    env = kwargs.pop ('env', None)\r
+    if env is None:\r
+      env = os.environ.copy ()\r
+    # This messes up some testcases, disable log redirection\r
+    env.pop ('GNUNET_FORCE_LOGFILE', None)\r
+    self.proc = subprocess.Popen (arglist, *pargs, env=env, **kwargs)\r
     if self.proc is None:\r
       print ("Failed to spawn a process {0}".format (arglist))\r
       sys.exit (1)\r