[pypy-commit] pypy release-2.2.x: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: release-2.2.x
Changeset: r68306:ae406fcaf180
Date: 2013-11-24 11:49 +0100
http://bitbucket.org/pypy/pypy/changeset/ae406fcaf180/

Log:	merge heads

diff --git a/rpython/tool/runsubprocess.py b/rpython/tool/runsubprocess.py
--- a/rpython/tool/runsubprocess.py
+++ b/rpython/tool/runsubprocess.py
@@ -49,7 +49,7 @@
         sys.stdout.flush()
 
 
-if sys.platform != 'win32' and hasattr(os, 'fork'):
+if sys.platform != 'win32' and hasattr(os, 'fork') and not os.getenv("PYPY_DONT_RUN_SUBPROCESS", None):
     # do this at import-time, when the process is still tiny
     _source = os.path.dirname(os.path.abspath(__file__))
     _source = os.path.join(_source, 'runsubprocess.py')   # and not e.g. '.pyc'