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

Unified Diff: recipe_modules/git/api.py

Issue 1750733002: Revert of Fix git recipe module to use git.bad as package resouce. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 4 years, 10 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 | « no previous file | recipe_modules/git/example.expected/platform_win.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: recipe_modules/git/api.py
diff --git a/recipe_modules/git/api.py b/recipe_modules/git/api.py
index 6205730429ff2821a1cd8c4a807e3ff1df8f31fb..e8003dc666c9e7c2e8e554ec544bd50cc3035064 100644
--- a/recipe_modules/git/api.py
+++ b/recipe_modules/git/api.py
@@ -18,7 +18,7 @@
kwargs.setdefault('cwd', self.m.path['checkout'])
git_cmd = ['git']
if self.m.platform.is_win:
- git_cmd = [self.package_resource('git.bat')]
+ git_cmd = [self.m.path['depot_tools'].join('git.bat')]
options = kwargs.pop('git_config_options', {})
for k, v in sorted(options.iteritems()):
git_cmd.extend(['-c', '%s=%s' % (k, v)])
@@ -172,7 +172,8 @@
remote_name = 'origin'
if self.m.platform.is_win:
- git_setup_args += ['--git_cmd_path', self.package_resource('git.bat')]
+ git_setup_args += ['--git_cmd_path',
+ self.m.path['depot_tools'].join('git.bat')]
step_suffix = '' if step_suffix is None else ' (%s)' % step_suffix
self.m.python(
« no previous file with comments | « no previous file | recipe_modules/git/example.expected/platform_win.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698