38 lines
1.6 KiB
Plaintext
38 lines
1.6 KiB
Plaintext
$NetBSD: patch-build_moz.configure_init.configure,v 1.3 2017/08/10 14:46:15 ryoon Exp $
|
|
|
|
--- build/moz.configure/init.configure.orig 2017-07-31 16:20:49.000000000 +0000
|
|
+++ build/moz.configure/init.configure
|
|
@@ -157,6 +157,7 @@ option(env='PYTHON', nargs=1, help='Pyth
|
|
@imports(_from='mozbuild.configure.util', _import='LineIO')
|
|
@imports(_from='mozbuild.virtualenv', _import='VirtualenvManager')
|
|
@imports(_from='mozbuild.virtualenv', _import='verify_python_version')
|
|
+@imports(_from='__builtin__', _import='KeyError')
|
|
@imports('distutils.sysconfig')
|
|
def virtualenv_python(env_python, build_env, mozconfig, help):
|
|
if help:
|
|
@@ -176,6 +177,12 @@ def virtualenv_python(env_python, build_
|
|
python = mozconfig['vars']['added']['PYTHON']
|
|
elif 'PYTHON' in mozconfig['vars']['modified']:
|
|
python = mozconfig['vars']['modified']['PYTHON'][1]
|
|
+ for i in ('env', 'vars'):
|
|
+ for j in ('added', 'modified'):
|
|
+ try:
|
|
+ del mozconfig[i][j]['PYTHON']
|
|
+ except KeyError:
|
|
+ pass
|
|
|
|
with LineIO(lambda l: log.error(l)) as out:
|
|
verify_python_version(out)
|
|
@@ -211,7 +218,10 @@ def virtualenv_python(env_python, build_
|
|
if python != normsep(sys.executable):
|
|
log.info('Reexecuting in the virtualenv')
|
|
if env_python:
|
|
- del os.environ['PYTHON']
|
|
+ try:
|
|
+ del os.environ['PYTHON']
|
|
+ except KeyError:
|
|
+ pass
|
|
# One would prefer to use os.execl, but that's completely borked on
|
|
# Windows.
|
|
sys.exit(subprocess.call([python] + sys.argv))
|