corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1769405 - Part 3: Return project and artifact-builds options from MozbuildObject.get_base_mozconfig_info. r=glandium

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D147012
This commit is contained in:
Tooru Fujisawa
2022-06-14 18:13:54 +00:00
parent af6c92306f
commit e43179c6df
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/mozbuild/mozbuild/base.py
View File

@@ -321,7 +321,7 @@ class MozbuildObject(ProcessExecutionMixin):
sandbox = ReducedConfigureSandbox( sandbox = ReducedConfigureSandbox(
{}, {},
environ=env, environ=env,
argv=["mach", "--help"], argv=["mach"],
logger=logger, logger=logger,
) )
base_dir = os.path.join(topsrcdir, "build", "moz.configure") base_dir = os.path.join(topsrcdir, "build", "moz.configure")
@@ -332,6 +332,10 @@ class MozbuildObject(ProcessExecutionMixin):
return { return {
"mozconfig": sandbox._value_for(sandbox["mozconfig"]), "mozconfig": sandbox._value_for(sandbox["mozconfig"]),
"target": sandbox._value_for(sandbox["real_target"]), "target": sandbox._value_for(sandbox["real_target"]),
"project": sandbox._value_for(sandbox._options["project"]),
"artifact-builds": sandbox._value_for(
sandbox._options["artifact-builds"]
),
} }
except SystemExit: except SystemExit:
print(out.getvalue()) print(out.getvalue())