From f20c5a4a3c70dd116fb8b0177f2e20b1a7038446 Mon Sep 17 00:00:00 2001 From: Nodir Turakulov Date: Thu, 30 Aug 2018 22:16:55 +0000 Subject: [PATCH] [bot_update] Fix initialization from buildbucket When checking if buildbucket.build_input.gitiles_commit exists, use HasField protobuf method, as opposed to truth check. A protobuf message field is always true. Bug: 877161 Change-Id: Ie4a7e22b985776441a74283b09646e8837c326f1 Reviewed-on: https://chromium-review.googlesource.com/1196930 Commit-Queue: Nodir Turakulov Reviewed-by: Andrii Shyshkalov --- recipes/recipe_modules/bot_update/api.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index 23b2a7e09c..d202ee5687 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -29,10 +29,12 @@ class BotUpdateApi(recipe_api.RecipeApi): super(BotUpdateApi, self).__init__(*args, **kwargs) def initialize(self): - gm = self.m.buildbucket.build_input.gitiles_commit - if self._revision is None and self._repository is None and gm: + build_input = self.m.buildbucket.build.input + if (self._revision is None and self._repository is None + and build_input.HasField('gitiles_commit')): + gm = build_input.gitiles_commit self._revision = gm.id - self._repository = gm.host + '/' + gm.project + self._repository = 'https://%s/%s' % (gm.host, gm.project) def __call__(self, name, cmd, **kwargs): """Wrapper for easy calling of bot_update."""