mirror of
https://git.freebsd.org/ports.git
synced 2025-04-29 10:06:40 -04:00
a9097e0cd9
in preparation for importing Thunderbird 137.0 Release Notes (soon): https://www.thunderbird.net/en-US/thunderbird/128.9.0esr/releasenotes/
21 lines
914 B
Text
21 lines
914 B
Text
# Accept API keys from environment like before bug 1294585
|
|
|
|
--- build/moz.configure/keyfiles.configure
|
|
+++ build/moz.configure/keyfiles.configure
|
|
@@ -19,6 +19,7 @@ def keyfile(desc, default=None, 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:
|
|
@@ -29,7 +30,7 @@ def keyfile(desc, default=None, 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
|
|
|