Bug 1465050: Remove reference to config_file_search_path r=marco
authorChris AtLee <catlee@mozilla.com>
Tue, 29 May 2018 13:38:13 -0400
changeset 801213 5852258260e15c03a61f3b64260bde4c321efa49
parent 801212 51db5a12a4108b3213e3d86a3251b074148d66cd
child 801214 89d79c2258be1c420153e1adc54338b0165fc88e
child 801347 3cb69bac2eac6758496c4584412274b44da0f557
push id111603
push usermozilla@kaply.com
push dateTue, 29 May 2018 22:12:07 +0000
reviewersmarco
bugs1465050
milestone62.0a1
Bug 1465050: Remove reference to config_file_search_path r=marco MozReview-Commit-ID: 2w3uQ226kzs
testing/mozharness/mozharness/mozilla/building/buildbase.py
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -542,22 +542,21 @@ class BuildOptionParser(object):
         valid_variant_cfg_path, prospective_cfg_path = cls.find_variant_cfg_path(
             '--custom-build-variant-cfg', value, parser)
 
         if not valid_variant_cfg_path:
             # either the value was an indeterminable path or an invalid short
             # name
             sys.exit("Whoops!\n'--custom-build-variant' was passed but an "
                      "appropriate config file could not be determined. Tried "
-                     "using: '%s' but it was either not:\n\t-- a valid "
-                     "shortname: %s \n\t-- a valid path in %s \n\t-- a "
-                     "valid variant for the given platform and bits." % (
+                     "using: '%s' but it was not:"
+                     "\n\t-- a valid shortname: %s "
+                     "\n\t-- a valid variant for the given platform and bits." % (
                          prospective_cfg_path,
-                         str(cls.build_variants.keys()),
-                         str(cls.config_file_search_path)))
+                         str(cls.build_variants.keys())))
         parser.values.config_files.append(valid_variant_cfg_path)
         setattr(parser.values, option.dest, value)  # the pool
 
     @classmethod
     def set_build_pool(cls, option, opt, value, parser):
         # first let's add the build pool file where there may be pool
         # specific keys/values. Then let's store the pool name
         parser.values.config_files.append(cls.build_pool_cfg_file)