зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1008943 - mozinfo should be cheaper to import. r=ahal
This commit is contained in:
Родитель
d3c2fc39e1
Коммит
38bf8b96e5
|
@ -8,16 +8,11 @@
|
|||
# linux) to the information; I certainly wouldn't want anyone parsing this
|
||||
# information and having behaviour depend on it
|
||||
|
||||
import ctypes
|
||||
import errno
|
||||
import json
|
||||
import os
|
||||
import platform
|
||||
import re
|
||||
import sys
|
||||
|
||||
import mozfile
|
||||
|
||||
# keep a copy of the os module since updating globals overrides this
|
||||
_os = os
|
||||
|
||||
|
@ -97,6 +92,8 @@ info.update({'processor': processor,
|
|||
})
|
||||
|
||||
if info['os'] == 'linux':
|
||||
import ctypes
|
||||
import errno
|
||||
PR_SET_SECCOMP = 22
|
||||
SECCOMP_MODE_FILTER = 2
|
||||
ctypes.CDLL("libc.so.6", use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0)
|
||||
|
@ -132,6 +129,9 @@ def update(new_info):
|
|||
"""
|
||||
|
||||
if isinstance(new_info, basestring):
|
||||
# lazy import
|
||||
import mozfile
|
||||
import json
|
||||
f = mozfile.load(new_info)
|
||||
new_info = json.loads(f.read())
|
||||
f.close()
|
||||
|
@ -207,6 +207,8 @@ def main(args=None):
|
|||
|
||||
# args are JSON blobs to override info
|
||||
if args:
|
||||
# lazy import
|
||||
import json
|
||||
for arg in args:
|
||||
if _os.path.exists(arg):
|
||||
string = file(arg).read()
|
||||
|
|
Загрузка…
Ссылка в новой задаче