scripts/slave/recipe_modules/chromite/api.py - Issue 1917243002: Revert "build: roll infra_paths changes"

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: scripts/slave/recipe_modules/chromite/api.py

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.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:

Index: scripts/slave/recipe_modules/chromite/api.py

diff --git a/scripts/slave/recipe_modules/chromite/api.py b/scripts/slave/recipe_modules/chromite/api.py

index 9403dc9513e9b0270dbef0036ce9b437ffd56996..b8706a9f204729735d1057f9e80aed3038b95be6 100644

--- a/scripts/slave/recipe_modules/chromite/api.py

+++ b/scripts/slave/recipe_modules/chromite/api.py

@@ -55,7 +55,7 @@ class ChromiteApi(recipe_api.RecipeApi):

v = self.m.path.c.dynamic_paths.get('chromite')

if v:

return v

- return self.m.infra_paths['slave_build'].join(self._chromite_subpath)

+ return self.m.path['slave_build'].join(self._chromite_subpath)

def _set_chromite_path(self, path):

self.m.path.c.dynamic_paths['chromite'] = path

@@ -360,4 +360,4 @@ class ChromiteApi(recipe_api.RecipeApi):

return self.cbuildbot(str('cbuildbot [%s]' % (self.c.cbb.config,)),

self.c.cbb.config,

args=cbb_args,

- cwd=self.m.infra_paths['slave_build'])

+ cwd=self.m.path['slave_build'])