Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Unified Diff: scripts/slave/recipe_modules/bot_update/api.py

Issue 288843003: Let bot_update recipe api force usage of bot_update. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Rebase Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/bot_update.py ('k') | scripts/slave/recipe_modules/bot_update/example.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/bot_update/api.py
diff --git a/scripts/slave/recipe_modules/bot_update/api.py b/scripts/slave/recipe_modules/bot_update/api.py
index 371ceabefc3c6f2c75709a6c4cb37720d01c26bc..d283e0ce8d80b103e6f152a3d94eced7ff23e57c 100644
--- a/scripts/slave/recipe_modules/bot_update/api.py
+++ b/scripts/slave/recipe_modules/bot_update/api.py
@@ -57,8 +57,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
def ensure_checkout(self, gclient_config=None, suffix=None,
patch=True, ref=None, update_presentation=True,
- revisions=[],
- **kwargs):
+ revisions=[], force=False, **kwargs):
# We can re-use the gclient spec from the gclient module, since all the
# data bot_update needs is already configured into the gclient spec.
cfg = gclient_config or self.m.gclient.c
@@ -119,11 +118,14 @@ class BotUpdateApi(recipe_api.RecipeApi):
cmd = [item for flag_set in flags
for item in flag_set if flag_set[1] is not None]
+ if force:
+ cmd.append('--force')
+
# Inject Json output for testing.
git_mode = self.m.properties.get('mastername') in GIT_MASTERS
first_sln = cfg.solutions[0].name
step_test_data = lambda: self.test_api.output_json(
- master, builder, slave, root, first_sln, rev_map, git_mode)
+ master, builder, slave, root, first_sln, rev_map, git_mode, force)
def followup_fn(step_result):
if update_presentation:
« no previous file with comments | « scripts/slave/bot_update.py ('k') | scripts/slave/recipe_modules/bot_update/example.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698