From d9568dac6645752c4ac213f82f1e54d08f0df46b Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Sat, 11 Nov 2017 13:50:21 -0700 Subject: [PATCH] Bug 1415618: Use path relative to mozharness config modules to find configs. r=jlund MozReview-Commit-ID: 6D6QEz9ulYX --HG-- extra : rebase_source : c41158494fe748d94706bb72d3566d978160f793 --- testing/mozharness/mozharness/base/config.py | 5 +++-- testing/mozharness/mozharness/mozilla/building/buildbase.py | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testing/mozharness/mozharness/base/config.py b/testing/mozharness/mozharness/base/config.py index e612b7ce7c52..df2b8896732b 100644 --- a/testing/mozharness/mozharness/base/config.py +++ b/testing/mozharness/mozharness/base/config.py @@ -135,6 +135,8 @@ class ReadOnlyDict(dict): result[k] = deepcopy(v, memo) return result +DEFAULT_CONFIG_PATH = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "configs") + # parse_config_file {{{1 def parse_config_file(file_name, quiet=False, search_path=None, config_dict_name="config"): @@ -145,8 +147,7 @@ def parse_config_file(file_name, quiet=False, search_path=None, file_path = file_name else: if not search_path: - search_path = ['.', os.path.join(sys.path[0], '..', 'configs'), - os.path.join(sys.path[0], '..', '..', 'configs')] + search_path = ['.', DEFAULT_CONFIG_PATH] for path in search_path: if os.path.exists(os.path.join(path, file_name)): file_path = os.path.join(path, file_name) diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index 855e79633a55..5acc96a63953 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -26,7 +26,7 @@ from itertools import chain import sys from datetime import datetime 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.script import PostScriptRun from mozharness.base.vcs.vcsbase import MercurialScript @@ -400,8 +400,7 @@ class BuildOptionParser(object): platform = None bits = None config_file_search_path = [ - '.', os.path.join(sys.path[0], '..', 'configs'), - os.path.join(sys.path[0], '..', '..', 'configs') + DEFAULT_CONFIG_PATH, ] # add to this list and you can automagically do things like