diff options
author | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2021-10-06 23:12:41 +0200 |
---|---|---|
committer | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2021-10-06 23:12:41 +0200 |
commit | 737c941d23dabb27ac2c98d0c8473400924c5905 (patch) | |
tree | d43a669cbd4b8526e4ac72ba3ec35c3ac727a5bb /mail/thunderbird/files/patch-env-api-keys | |
parent | net-mgmt/check_ssl_cert: update to 2.9.1 (diff) |
mail/thunderbird: update to 91.2.0
Release Notes:
https://www.thunderbird.net/en-US/thunderbird/91.2.0/releasenotes/
This brings in Thunderbird 91esr:
- the calendar is not optional anymore
- gtk2 is not directly required anymore
- integrated PDF viewer
- and much more: https://support.mozilla.org/en-US/kb/new-thunderbird-91
Diffstat (limited to 'mail/thunderbird/files/patch-env-api-keys')
-rw-r--r-- | mail/thunderbird/files/patch-env-api-keys | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mail/thunderbird/files/patch-env-api-keys b/mail/thunderbird/files/patch-env-api-keys index e20b012f27cf..a97a99d6b54a 100644 --- a/mail/thunderbird/files/patch-env-api-keys +++ b/mail/thunderbird/files/patch-env-api-keys @@ -2,20 +2,20 @@ --- 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') +@@ -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: -@@ -28,7 +29,7 @@ def keyfile(desc, help=None, callback=lambda x: x): +@@ -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 environ.get("MOZ_%s_KEY" % desc.upper().replace(" ", "_")) or no_key return keyfile |