diff options
Diffstat (limited to 'www/firefox/files/patch-bug1288587')
| -rw-r--r-- | www/firefox/files/patch-bug1288587 | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/www/firefox/files/patch-bug1288587 b/www/firefox/files/patch-bug1288587 index a911043358c9..6130cf7e30da 100644 --- a/www/firefox/files/patch-bug1288587 +++ b/www/firefox/files/patch-bug1288587 @@ -2,34 +2,34 @@ diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.confi index 855214a..1e91d51 100644 --- build/moz.configure/init.configure +++ build/moz.configure/init.configure -@@ -240,6 +240,7 @@ option(env='VIRTUALENV_NAME', nargs=1, default='init_p - @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') - @imports(_from='mozbuild.pythonutil', _import='python_executable_version') - @imports(_from='six', _import='ensure_text') -+@imports(_from='__builtin__', _import='KeyError') +@@ -238,6 +238,7 @@ option( + @imports(_from="mozbuild.pythonutil", _import="find_python3_executable") + @imports(_from="mozbuild.pythonutil", _import="python_executable_version") + @imports(_from="six", _import="ensure_text") ++@imports(_from="__builtin__", _import="KeyError") def virtualenv_python3(env_python, virtualenv_name, build_env, mozconfig, help): # Avoid re-executing python when running configure --help. if help: -@@ -273,6 +274,12 @@ def virtualenv_python3(env_python, virtualenv_name, bu - python = mozconfig['vars']['added']['PYTHON3'] - elif 'PYTHON3' in mozconfig['vars']['modified']: - python = mozconfig['vars']['modified']['PYTHON3'][1] -+ for i in ('env', 'vars'): -+ for j in ('added', 'modified'): +@@ -271,6 +272,12 @@ def virtualenv_python3(env_python, virtualenv_name, bu + python = mozconfig["vars"]["added"]["PYTHON3"] + elif "PYTHON3" in mozconfig["vars"]["modified"]: + python = mozconfig["vars"]["modified"]["PYTHON3"][1] ++ for i in ("env", "vars"): ++ for j in ("added", "modified"): + try: -+ del mozconfig[i][j]['PYTHON3'] ++ del mozconfig[i][j]["PYTHON3"] + except KeyError: + pass log.debug("python3: executable from configuration: %r" % python) -@@ -358,7 +365,10 @@ def virtualenv_python3(env_python, virtualenv_name, bu - sys.executable, manager.python_path)) - log.info('Re-executing in the virtualenv') +@@ -364,7 +371,10 @@ def virtualenv_python3(env_python, virtualenv_name, bu + ) + log.info("Re-executing in the virtualenv") if env_python: -- del os.environ['PYTHON3'] +- del os.environ["PYTHON3"] + try: -+ del os.environ['PYTHON3'] ++ del os.environ["PYTHON3"] + except KeyError: + pass # Homebrew on macOS will change Python's sys.executable to a custom |