diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2018-07-18 23:44:21 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2018-07-18 23:44:21 +0000 |
commit | e344179e4710fcd9e8b27f21ad966399c6676062 (patch) | |
tree | 25470098899348b52b879360dae665e7d4b833ee /mail/thunderbird/files/patch-env-api-keys | |
parent | - missed a '+" (diff) |
mail/thunderbird: drop patches in preparation for update
$ svn commit
Sending Mk/Uses/gecko.mk
Sending mail/thunderbird/Makefile
Sending mail/thunderbird/distinfo
Sending mail/thunderbird/files/patch-addon-search
Replacing mail/thunderbird/files/patch-bug1021761
Adding mail/thunderbird/files/patch-bug1144632
Deleting mail/thunderbird/files/patch-bug1186967
[...]
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/mail/thunderbird/files/patch-bug702179"
== Additional errors may compound and may not be accurate ==
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1021761"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1288587"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug847568"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-env-api-keys"
[...]
Pointy hat to: portmgr (multi-steps are error prone)
Notes
Notes:
svn path=/head/; revision=474920
Diffstat (limited to 'mail/thunderbird/files/patch-env-api-keys')
-rw-r--r-- | mail/thunderbird/files/patch-env-api-keys | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/mail/thunderbird/files/patch-env-api-keys b/mail/thunderbird/files/patch-env-api-keys deleted file mode 100644 index 79ef822b0761..000000000000 --- a/mail/thunderbird/files/patch-env-api-keys +++ /dev/null @@ -1,21 +0,0 @@ -# Accept API keys from environment like before bug 1294585 - ---- mozilla/build/moz.configure/keyfiles.configure -+++ mozilla/build/moz.configure/keyfiles.configure -@@ -18,6 +18,7 @@ def keyfile(desc, help=None, callback=lambda x: x): - @checking('for the %s key' % desc, lambda x: x and x is not no_key) - @imports(_from='__builtin__', _import='open') - @imports(_from='__builtin__', _import='IOError') -+ @imports(_from='os', _import='environ') - def keyfile(value): - if value: - try: -@@ -28,7 +29,7 @@ def keyfile(desc, help=None, callback=lambda x: x): - raise FatalCheckError("'%s' is empty." % value[0]) - except IOError as e: - raise FatalCheckError("'%s': %s." % (value[0], e.strerror)) -- return no_key -+ return environ.get('MOZ_%s_KEY' % desc.upper().replace(' ', '_')) or no_key - - return keyfile - |