diff options
Diffstat (limited to 'www/firefox/files/patch-env-api-keys')
| -rw-r--r-- | www/firefox/files/patch-env-api-keys | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/firefox/files/patch-env-api-keys b/www/firefox/files/patch-env-api-keys index e20b012f27cf..a97a99d6b54a 100644 --- a/www/firefox/files/patch-env-api-keys +++ b/www/firefox/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 |