Skip to content
This repository
Browse code

Merge pull request #323 from pnasrat/develop

Unset __PYENV_LAUNCHER__ for frameworks.
  • Loading branch information...
commit 756fd9533a5f7422c17f8f8486341206135bd120 2 parents 1b9cb8d + b3eb01d
Jannis Leidel jezdez authored

Showing 1 changed file with 5 additions and 1 deletion. Show diff stats Hide diff stats

  1. +5 1 virtualenv.py
6 virtualenv.py
@@ -511,7 +511,7 @@ def _install_req(py_executable, unzip=False, distribute=False,
511 511 if unzip:
512 512 cmd.append('--always-unzip')
513 513 env = {}
514   - remove_from_env = []
  514 + remove_from_env = ['__PYVENV_LAUNCHER__']
515 515 if logger.stdout_level_matches(logger.DEBUG):
516 516 cmd.append('-v')
517 517
@@ -1257,6 +1257,10 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear):
1257 1257 mkdir(bin_dir)
1258 1258 py_executable = join(bin_dir, os.path.basename(sys.executable))
1259 1259 if 'Python.framework' in prefix:
  1260 + # OS X framework builds cause validation to break
  1261 + # https://github.com/pypa/virtualenv/issues/322
  1262 + if os.environ.get('__PYVENV_LAUNCHER__'):
  1263 + os.unsetenv('__PYVENV_LAUNCHER__')
1260 1264 if re.search(r'/Python(?:-32|-64)*$', py_executable):
1261 1265 # The name of the python executable is not quite what
1262 1266 # we want, rename it.

0 comments on commit 756fd95

Please sign in to comment.
Something went wrong with that request. Please try again.