summaryrefslogtreecommitdiff
path: root/www/firefox-esr/files/patch-bug1288587
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-06-20 00:19:29 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-06-20 00:19:29 +0000
commit1ffba2ac4cb0152f6bea9c944279dd0c9b399151 (patch)
tree06db800746c0920701662665f78f38b492d43fbf /www/firefox-esr/files/patch-bug1288587
parentwww/firefox-esr: update to 52.9.0 (diff)
www/firefox-esr: remove in preparation for update
$ svn ci Sending Mk/Uses/gecko.mk Replacing www/firefox-esr Sending www/firefox-esr/Makefile Deleting www/firefox-esr/Makefile.options Sending www/firefox-esr/distinfo Deleting www/firefox-esr/files/patch-bug1435212 Sending www/firefox-esr/files/patch-z-bug1436911 Deleting www/firefox-esr/files/pkg-deinstall.in Deleting www/firefox-esr/files/pkg-install.in Replacing www/firefox-esr-i18n Sending www/firefox-esr-i18n/Makefile Sending www/firefox-esr-i18n/distinfo Transmitting file data ......done Committing transaction... svn: E165001: Commit failed (details follow): svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output: Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" == Additional errors may compound and may not be accurate == Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" == Pre-commit problem count: 12 svn: E165001: Your commit message was left in a temporary file: svn: E165001: '/path/to/head/svn-commit.tmp'
Diffstat (limited to 'www/firefox-esr/files/patch-bug1288587')
-rw-r--r--www/firefox-esr/files/patch-bug128858767
1 files changed, 0 insertions, 67 deletions
diff --git a/www/firefox-esr/files/patch-bug1288587 b/www/firefox-esr/files/patch-bug1288587
deleted file mode 100644
index e10ef8537a4a..000000000000
--- a/www/firefox-esr/files/patch-bug1288587
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
-index 855214a..1e91d51 100644
---- build/moz.configure/init.configure
-+++ build/moz.configure/init.configure
-@@ -165,16 +165,17 @@ option(env='PYTHON', nargs=1, help='Python interpreter')
- # ==============================================================
- @depends('PYTHON', check_build_environment, mozconfig, '--help')
- @imports('os')
- @imports('sys')
- @imports('subprocess')
- @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:
- return
-
- python = env_python[0] if env_python else None
-
- # Ideally we'd rely on the mozconfig injection from mozconfig_options,
-@@ -184,16 +185,22 @@ def virtualenv_python(env_python, build_env, mozconfig, help):
- if 'PYTHON' in mozconfig['env']['added']:
- python = mozconfig['env']['added']['PYTHON']
- elif 'PYTHON' in mozconfig['env']['modified']:
- python = mozconfig['env']['modified']['PYTHON'][1]
- elif 'PYTHON' in mozconfig['vars']['added']:
- 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)
- topsrcdir, topobjdir = build_env.topsrcdir, build_env.topobjdir
- if topobjdir.endswith('/js/src'):
- 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):
- log.info('Creating Python environment')
- manager.build(python)
-
- python = normsep(manager.python_path)
-
- 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))
-
- # We are now in the virtualenv
- if not distutils.sysconfig.get_python_lib():
- die('Could not determine python site packages directory')
-