diff options
| author | Don Garrett <dgarrett@google.com> | 2015-10-22 17:43:47 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-10-23 13:18:57 -0700 |
| commit | 737cadd19ccbe89494f954ce864405cd77d7ebc6 (patch) | |
| tree | 8ed76d0d13ecbb5da3e7ec2f50c2956b19e4d324 | |
| parent | 0b321cad0634f13ad66f49d1a133c0d5dbbb1f26 (diff) | |
| download | chromite-737cadd19ccbe89494f954ce864405cd77d7ebc6.tar.gz | |
config_lib: Update misc users to config_lib.GetConfig.
Various scripts were left using the unpreferred (and uncached)
config_lib.LoadConfigFromFile when they should be using
config_lib.GetConfig.
The result is the same, but GetConfig only loads/parses from file once
per run.
BUG=None
TEST=run_tests
Change-Id: Ia9932390e79a3dc964eea4ae40f45d270af26ce0
Reviewed-on: https://chromium-review.googlesource.com/308244
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Matthew Sartori <msartori@chromium.org>
| -rw-r--r-- | cbuildbot/binhost_test.py | 2 | ||||
| -rw-r--r-- | cbuildbot/update_binhost_json.py | 2 | ||||
| -rw-r--r-- | scripts/cros_best_revision.py | 2 | ||||
| -rw-r--r-- | scripts/cros_show_waterfall_layout.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cbuildbot/binhost_test.py b/cbuildbot/binhost_test.py index 0bab437b6..eb19707a5 100644 --- a/cbuildbot/binhost_test.py +++ b/cbuildbot/binhost_test.py @@ -40,7 +40,7 @@ class PrebuiltCompatibilityTest(cros_test_lib.TestCase): # TODO(davidjames): Empty this list. BOARDS_WITHOUT_CHROMIUM_PFQS = ['rush_ryu', 'smaug'] - site_config = config_lib.LoadConfigFromFile() + site_config = config_lib.GetConfig() @classmethod def setUpClass(cls): diff --git a/cbuildbot/update_binhost_json.py b/cbuildbot/update_binhost_json.py index 9d1625ac6..8c7ebf1b8 100644 --- a/cbuildbot/update_binhost_json.py +++ b/cbuildbot/update_binhost_json.py @@ -34,7 +34,7 @@ def main(argv): cros_build_lib.AssertInsideChroot() opts = _ParseArguments(argv) - site_config = config_lib.LoadConfigFromFile() + site_config = config_lib.GetConfig() logging.info('Generating board configs. This takes about 2m...') for key in sorted(binhost.GetChromePrebuiltConfigs(site_config)): diff --git a/scripts/cros_best_revision.py b/scripts/cros_best_revision.py index 841672170..ca424ad6d 100644 --- a/scripts/cros_best_revision.py +++ b/scripts/cros_best_revision.py @@ -49,7 +49,7 @@ class ChromeCommitter(object): self._dryrun = dryrun self._lkgm = None self._old_lkgm = None - self.site_config = config_lib.LoadConfigFromFile() + self.site_config = config_lib.GetConfig() def CheckoutChromeLKGM(self): diff --git a/scripts/cros_show_waterfall_layout.py b/scripts/cros_show_waterfall_layout.py index 0b064a63d..9bad367c6 100644 --- a/scripts/cros_show_waterfall_layout.py +++ b/scripts/cros_show_waterfall_layout.py @@ -61,7 +61,7 @@ def _ParseArguments(argv): def main(argv): opts = _ParseArguments(argv) - site_config = config_lib.LoadConfigFromFile() + site_config = config_lib.GetConfig() layout = {} for config_name, config in site_config.iteritems(): |