bot_update: ensure correct depot_tools checkout is used.

R=vadimsh@chromium.org,martiniss@chromium.org
BUG=635641,647446

Review-Url: https://codereview.chromium.org/2346973003
changes/18/399118/1
tandrii 9 years ago committed by Commit bot
parent 18ca30ca80
commit 972ac50401

@ -34,7 +34,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
kwargs.setdefault('env', {})
kwargs['env'].setdefault('PATH', '%(PATH)s')
kwargs['env']['PATH'] = self.m.path.pathsep.join([
kwargs['env']['PATH'], str(self._module.PACKAGE_REPO_ROOT)])
str(self._module.PACKAGE_REPO_ROOT), kwargs['env']['PATH']])
return self.m.python(name, bot_update_path, cmd, **kwargs)
@property

@ -18,7 +18,7 @@
"src@abc"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update (without patch)",
"~followup_annotations": [

@ -19,7 +19,7 @@
"--output_manifest"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -19,7 +19,7 @@
"--with_branch_heads"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update - with branch heads",
"~followup_annotations": [

@ -19,7 +19,7 @@
"--clobber"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -19,7 +19,7 @@
"--gerrit_no_rebase_patch_ref"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -19,7 +19,7 @@
"--gerrit_no_reset"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -19,7 +19,7 @@
"--no_shallow"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -18,7 +18,7 @@
"src@revision"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -20,7 +20,7 @@
"+refs/change/1/2/333"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -22,7 +22,7 @@
"src@HEAD"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -24,7 +24,7 @@
"src@HEAD"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -24,7 +24,7 @@
"src@HEAD"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -24,7 +24,7 @@
"src@HEAD"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -24,7 +24,7 @@
"src@HEAD"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -24,7 +24,7 @@
"src/third_party/angle@HEAD"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -26,7 +26,7 @@
"src/v8@abc"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

@ -26,7 +26,7 @@
"src/v8@HEAD"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "bot_update",
"~followup_annotations": [

Loading…
Cancel
Save