recipe_modules/git/api.py - Issue 1742403002: Fix git recipe module to use git.bad as package resouce.

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/git/api.py

Issue 1742403002: 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

Index: recipe_modules/git/api.py

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

index e8003dc666c9e7c2e8e554ec544bd50cc3035064..6205730429ff2821a1cd8c4a807e3ff1df8f31fb 100644

--- a/recipe_modules/git/api.py

+++ b/recipe_modules/git/api.py

@@ -18,7 +18,7 @@ class GitApi(recipe_api.RecipeApi):

kwargs.setdefault('cwd', self.m.path['checkout'])

git_cmd = ['git']

if self.m.platform.is_win:

- git_cmd = [self.m.path['depot_tools'].join('git.bat')]

+ git_cmd = [self.package_resource('git.bat')]

options = kwargs.pop('git_config_options', {})

for k, v in sorted(options.iteritems()):

git_cmd.extend(['-c', '%s=%s' % (k, v)])

@@ -172,8 +172,7 @@ class GitApi(recipe_api.RecipeApi):

remote_name = 'origin'

if self.m.platform.is_win:

- git_setup_args += ['--git_cmd_path',

- self.m.path['depot_tools'].join('git.bat')]

+ git_setup_args += ['--git_cmd_path', self.package_resource('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 »