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

Unified Diff: recipe_modules/git/api.py

Issue 1785443002: depot_tools: adjust for resource API changes in recipe engine (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 4 years, 9 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
Index: recipe_modules/git/api.py
diff --git a/recipe_modules/git/api.py b/recipe_modules/git/api.py
index d2d84f972ba4d7c50e36d9cf4f700059d68b317e..1751c9622dfaf67523c49def98656769a280a47c 100644
--- a/recipe_modules/git/api.py
+++ b/recipe_modules/git/api.py
@@ -23,7 +23,7 @@ class GitApi(recipe_api.RecipeApi):
git_cmd = ['git']
if self.m.platform.is_win:
self.ensure_win_git_tooling()
- git_cmd = [self.package_resource('git.bat')]
+ git_cmd = [self.package_repo_resource('git.bat')]
options = kwargs.pop('git_config_options', {})
for k, v in sorted(options.iteritems()):
git_cmd.extend(['-c', '%s=%s' % (k, v)])
@@ -43,9 +43,9 @@ class GitApi(recipe_api.RecipeApi):
return
self.m.step(
'ensure git tooling on windows',
- [self.package_resource('bootstrap', 'win', 'win_tools.bat')],
+ [self.package_repo_resource('bootstrap', 'win', 'win_tools.bat')],
infra_step=True,
- cwd=self.package_resource())
+ cwd=self.package_repo_resource())
self.initialized_win_git = True
def fetch_tags(self, remote_name=None, **kwargs):
@@ -189,7 +189,8 @@ class GitApi(recipe_api.RecipeApi):
if self.m.platform.is_win:
self.ensure_win_git_tooling()
- git_setup_args += ['--git_cmd_path', self.package_resource('git.bat')]
+ git_setup_args += [
+ '--git_cmd_path', self.package_repo_resource('git.bat')]
step_suffix = '' if step_suffix is None else ' (%s)' % step_suffix
self.m.python(

Powered by Google App Engine
This is Rietveld 408576698