aboutsummaryrefslogtreecommitdiffstats
path: root/www/firefox-esr/files/patch-bug1288587
diff options
context:
space:
mode:
Diffstat (limited to 'www/firefox-esr/files/patch-bug1288587')
-rw-r--r--www/firefox-esr/files/patch-bug12885874
1 files changed, 2 insertions, 2 deletions
diff --git a/www/firefox-esr/files/patch-bug1288587 b/www/firefox-esr/files/patch-bug1288587
index e10ef8537a4a..f8190a7176e8 100644
--- a/www/firefox-esr/files/patch-bug1288587
+++ b/www/firefox-esr/files/patch-bug1288587
@@ -43,13 +43,13 @@ index 855214a..1e91d51 100644
topobjdir = topobjdir[:-7]
with LineIO(lambda l: log.info(l)) as out:
-@@ -219,17 +226,20 @@ def virtualenv_python(env_python, build_env, mozconfig, help):
+@@ -255,17 +262,20 @@ def virtualenv_python(env_python, build_env, mozconfig
log.info('Creating Python environment')
manager.build(python)
python = normsep(manager.python_path)
- if python != normsep(sys.executable):
+ if not normsep(sys.executable).startswith(normsep(virtualenvs_root)):
log.info('Reexecuting in the virtualenv')
if env_python:
- del os.environ['PYTHON']