Changeset View
Changeset View
Standalone View
Standalone View
head/mail/thunderbird/files/patch-env-api-keys
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| # Accept API keys from environment like before bug 1294585 | |||||
| --- build/moz.configure/keyfiles.configure | |||||
| +++ 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 | |||||