From e94deafd142f84d8745c1d7226532cec703c5349 Mon Sep 17 00:00:00 2001 From: John Budorick Date: Tue, 14 Aug 2018 23:19:43 +0000 Subject: [PATCH] bot_update: pull revisions from provided cfg if present. Bug: 873186 Change-Id: I91649cc5f4ba8f81f982463aa534e77d88f87ac0 Reviewed-on: https://chromium-review.googlesource.com/1175099 Reviewed-by: Edward Lesmes Reviewed-by: Andrii Shyshkalov Commit-Queue: John Budorick --- recipes/recipe_modules/bot_update/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index bda426ba7f..ae2868adb9 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -160,11 +160,11 @@ class BotUpdateApi(recipe_api.RecipeApi): self._parent_got_revision or self._revision or 'HEAD') - if self.m.gclient.c and self.m.gclient.c.revisions: + if cfg.revisions: # Only update with non-empty values. Some recipe might otherwise # overwrite the HEAD default with an empty string. revisions.update( - (k, v) for k, v in self.m.gclient.c.revisions.iteritems() if v) + (k, v) for k, v in cfg.revisions.iteritems() if v) if cfg.solutions and root_solution_revision: revisions[cfg.solutions[0].name] = root_solution_revision # Allow for overrides required to bisect into rolls.