Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1415618: Use path relative to mozharness config modules to find configs. r=jlund

Browse Source 
MozReview-Commit-ID: 6D6QEz9ulYX

--HG--
extra : rebase_source : c41158494fe748d94706bb72d3566d978160f793
This commit is contained in:
Tom Prince 2017-11-11 13:50:21 -07:00
parent fc654248b1
commit d9568dac66
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testing/mozharness/mozharness/base/config.py
View File

@ -135,6 +135,8 @@ class ReadOnlyDict(dict):
result[k] = deepcopy(v, memo) result[k] = deepcopy(v, memo)
return result return result
DEFAULT_CONFIG_PATH = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "configs")
# parse_config_file {{{1 # parse_config_file {{{1
def parse_config_file(file_name, quiet=False, search_path=None, def parse_config_file(file_name, quiet=False, search_path=None,
config_dict_name="config"): config_dict_name="config"):
@ -145,8 +147,7 @@ def parse_config_file(file_name, quiet=False, search_path=None,
file_path = file_name file_path = file_name
else: else:
if not search_path: if not search_path:
search_path = ['.', os.path.join(sys.path[0], '..', 'configs'), search_path = ['.', DEFAULT_CONFIG_PATH]
os.path.join(sys.path[0], '..', '..', 'configs')]
for path in search_path: for path in search_path:
if os.path.exists(os.path.join(path, file_name)): if os.path.exists(os.path.join(path, file_name)):
file_path = os.path.join(path, file_name) file_path = os.path.join(path, file_name)

5
testing/mozharness/mozharness/mozilla/building/buildbase.py
View File

@ -26,7 +26,7 @@ from itertools import chain
import sys import sys
from datetime import datetime from datetime import datetime
import re import re
from mozharness.base.config import BaseConfig, parse_config_file from mozharness.base.config import BaseConfig, parse_config_file, DEFAULT_CONFIG_PATH
from mozharness.base.log import ERROR, OutputParser, FATAL from mozharness.base.log import ERROR, OutputParser, FATAL
from mozharness.base.script import PostScriptRun from mozharness.base.script import PostScriptRun
from mozharness.base.vcs.vcsbase import MercurialScript from mozharness.base.vcs.vcsbase import MercurialScript
@ -400,8 +400,7 @@ class BuildOptionParser(object):
platform = None platform = None
bits = None bits = None
config_file_search_path = [ config_file_search_path = [
'.', os.path.join(sys.path[0], '..', 'configs'), DEFAULT_CONFIG_PATH,
os.path.join(sys.path[0], '..', '..', 'configs')
] ]
# add to this list and you can automagically do things like # add to this list and you can automagically do things like