Changeset View
Changeset View
Standalone View
Standalone View
www/firefox/files/patch-bug1288587
| diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure | diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure | ||||
| index 855214a..1e91d51 100644 | index 855214a..1e91d51 100644 | ||||
| --- build/moz.configure/init.configure | --- build/moz.configure/init.configure | ||||
| +++ build/moz.configure/init.configure | +++ build/moz.configure/init.configure | ||||
| @@ -252,6 +252,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre | @@ -251,6 +251,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre | ||||
| @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') | @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') | ||||
| @imports(_from='mozbuild.pythonutil', _import='python_executable_version') | @imports(_from='mozbuild.pythonutil', _import='python_executable_version') | ||||
| @imports(_from='six', _import='ensure_text') | @imports(_from='six', _import='ensure_text') | ||||
| +@imports(_from='__builtin__', _import='KeyError') | +@imports(_from='__builtin__', _import='KeyError') | ||||
| def virtualenv_python3(env_python, build_env, mozconfig, help): | def virtualenv_python3(env_python, build_env, mozconfig, help): | ||||
| # Avoid re-executing python when running configure --help. | # Avoid re-executing python when running configure --help. | ||||
| if help: | if help: | ||||
| @@ -284,6 +285,12 @@ def virtualenv_python3(env_python, build_env, mozconfi | @@ -283,6 +284,12 @@ def virtualenv_python3(env_python, build_env, mozconfi | ||||
| python = mozconfig['vars']['added']['PYTHON3'] | python = mozconfig['vars']['added']['PYTHON3'] | ||||
| elif 'PYTHON3' in mozconfig['vars']['modified']: | elif 'PYTHON3' in mozconfig['vars']['modified']: | ||||
| python = mozconfig['vars']['modified']['PYTHON3'][1] | python = mozconfig['vars']['modified']['PYTHON3'][1] | ||||
| + for i in ('env', 'vars'): | + for i in ('env', 'vars'): | ||||
| + for j in ('added', 'modified'): | + for j in ('added', 'modified'): | ||||
| + try: | + try: | ||||
| + del mozconfig[i][j]['PYTHON3'] | + del mozconfig[i][j]['PYTHON3'] | ||||
| + except KeyError: | + except KeyError: | ||||
| + pass | + pass | ||||
| log.debug("python3: executable from configuration: %r" % python) | log.debug("python3: executable from configuration: %r" % python) | ||||
| @@ -373,7 +380,10 @@ def virtualenv_python3(env_python, build_env, mozconfi | @@ -365,7 +372,10 @@ def virtualenv_python3(env_python, build_env, mozconfi | ||||
| sys.executable, manager.python_path)) | sys.executable, manager.python_path)) | ||||
| log.info('Re-executing in the virtualenv') | log.info('Re-executing in the virtualenv') | ||||
| if env_python: | if env_python: | ||||
| - del os.environ['PYTHON3'] | - del os.environ['PYTHON3'] | ||||
| + try: | + try: | ||||
| + del os.environ['PYTHON3'] | + del os.environ['PYTHON3'] | ||||
| + except KeyError: | + except KeyError: | ||||
| + pass | + pass | ||||
| # Homebrew on macOS will change Python's sys.executable to a custom | # Homebrew on macOS will change Python's sys.executable to a custom | ||||
| # value which messes with mach's virtualenv handling code. Override | # value which messes with mach's virtualenv handling code. Override | ||||
| # Homebrew's changes with the correct sys.executable value. | # Homebrew's changes with the correct sys.executable value. | ||||