[GNUnet-SVN] r18320 - gnunet/contrib

[gnunet]

Author: grothoff
Date: 2011-11-25 17:01:07 +0100 (Fri, 25 Nov 2011)
New Revision: 18320

Modified:
   gnunet/contrib/gnunet_pyexpect.py.in
Log:
-pyexpect fix

Modified: gnunet/contrib/gnunet_pyexpect.py.in
===================================================================
--- gnunet/contrib/gnunet_pyexpect.py.in        2011-11-25 15:48:13 UTC (rev 
18319)
+++ gnunet/contrib/gnunet_pyexpect.py.in        2011-11-25 16:01:07 UTC (rev 
18320)
@@ -31,7 +31,12 @@
     super (pexpect, self).__init__ ()
 
   def spawn (self, stdin, arglist, *pargs, **kwargs):
-    self.proc = subprocess.Popen (arglist, *pargs, **kwargs)
+    env = kwargs.pop ('env', None)
+    if env is None:
+      env = os.environ.copy ()
+    # This messes up some testcases, disable log redirection
+    env.pop ('GNUNET_FORCE_LOGFILE', None)
+    self.proc = subprocess.Popen (arglist, *pargs, env=env, **kwargs)
     if self.proc is None:
       print ("Failed to spawn a process {0}".format (arglist))
       sys.exit (1)