mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 16:25:38 +00:00
Bug 1562686 - revert remaining unnecessary bit of bug 1187245; r=glandium
Depends on D41454 Differential Revision: https://phabricator.services.mozilla.com/D42644 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
13f9bc563c
commit
be3fd44f98
@ -104,8 +104,6 @@ class MachCommands(MachCommandBase):
|
|||||||
env['MOZ_DISABLE_NONLOCAL_CONNECTIONS'] = '1'
|
env['MOZ_DISABLE_NONLOCAL_CONNECTIONS'] = '1'
|
||||||
env['XPCOM_DEBUG_BREAK'] = 'warn'
|
env['XPCOM_DEBUG_BREAK'] = 'warn'
|
||||||
|
|
||||||
env.update(self.extra_environment_variables)
|
|
||||||
|
|
||||||
outputHandler = OutputHandler(self.log)
|
outputHandler = OutputHandler(self.log)
|
||||||
kp_kwargs = {'processOutputLine': [outputHandler]}
|
kp_kwargs = {'processOutputLine': [outputHandler]}
|
||||||
|
|
||||||
|
@ -384,23 +384,6 @@ class MozbuildObject(ProcessExecutionMixin):
|
|||||||
|
|
||||||
return platform_name, bits + 'bit'
|
return platform_name, bits + 'bit'
|
||||||
|
|
||||||
@memoized_property
|
|
||||||
def extra_environment_variables(self):
|
|
||||||
'''Some extra environment variables are stored in .mozconfig.mk.
|
|
||||||
This functions extracts and returns them.'''
|
|
||||||
from mozbuild import shellutil
|
|
||||||
mozconfig_mk = os.path.join(self.topobjdir, '.mozconfig.mk')
|
|
||||||
env = {}
|
|
||||||
with open(mozconfig_mk) as fh:
|
|
||||||
for line in fh:
|
|
||||||
if line.startswith('export '):
|
|
||||||
exports = shellutil.split(line)[1:]
|
|
||||||
for e in exports:
|
|
||||||
if '=' in e:
|
|
||||||
key, value = e.split('=')
|
|
||||||
env[key] = value
|
|
||||||
return env
|
|
||||||
|
|
||||||
@memoized_property
|
@memoized_property
|
||||||
def repository(self):
|
def repository(self):
|
||||||
'''Get a `mozversioncontrol.Repository` object for the
|
'''Get a `mozversioncontrol.Repository` object for the
|
||||||
|
Loading…
Reference in New Issue
Block a user