X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=contrib%2Fgnunet_pyexpect.py.in;h=9e5c83fa37e66aca3eda47f5abce6da1b4f868b4;hb=57ce91e29030ed0608511491aaf7b4b45fedb2d4;hp=15d19fe5a6c002e5fbaa6747246664f4b17bae82;hpb=ab81cb16f400110163530a6eaf967224296b99aa;p=oweals%2Fgnunet.git

diff --git a/contrib/gnunet_pyexpect.py.in b/contrib/gnunet_pyexpect.py.in
index 15d19fe5a..9e5c83fa3 100644
--- a/contrib/gnunet_pyexpect.py.in
+++ b/contrib/gnunet_pyexpect.py.in
@@ -31,7 +31,12 @@ class pexpect (object):
     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)