recipe_modules/bot_update/api.py - Issue 1915463002: depot_tools: add infra_paths recipe module for infra-specific paths

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: recipe_modules/bot_update/api.py

Issue 1915463002: depot_tools: add infra_paths recipe module for infra-specific paths (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Created 4 years, 8 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 | « recipe_modules/bot_update/__init__.py ('k') | recipe_modules/bot_update/example.expected/basic.json » ('j') | recipe_modules/bot_update/example.expected/basic.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: recipe_modules/bot_update/api.py

diff --git a/recipe_modules/bot_update/api.py b/recipe_modules/bot_update/api.py

index 31a27335c82c2d67528b6906cce51b748dfd6c98..57b2e4a84bf8218a18b9ad752ee4e0ae6497cdd6 100644

--- a/recipe_modules/bot_update/api.py

+++ b/recipe_modules/bot_update/api.py

@@ -121,9 +121,9 @@ class BotUpdateApi(recipe_api.RecipeApi):

# Point to the oauth2 auth files if specified.

# These paths are where the bots put their credential files.

if patch_oauth2:

- email_file = self.m.path['build'].join(

+ email_file = self.m.infra_paths['build'].join(

'site_config', '.rietveld_client_email')

- key_file = self.m.path['build'].join(

+ key_file = self.m.infra_paths['build'].join(

'site_config', '.rietveld_secret_key')

else:

email_file = key_file = None

@@ -272,7 +272,7 @@ class BotUpdateApi(recipe_api.RecipeApi):

# first solution.

if step_result.json.output['did_run']:

co_root = step_result.json.output['root']

- cwd = kwargs.get('cwd', self.m.path['slave_build'])

+ cwd = kwargs.get('cwd', self.m.infra_paths['slave_build'])

if 'checkout' not in self.m.path:

self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))