diff --git a/recipe_modules/git/api.py b/recipe_modules/git/api.py index 620573042..e8003dc66 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.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 @@ class GitApi(recipe_api.RecipeApi): 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( diff --git a/recipe_modules/git/example.expected/platform_win.json b/recipe_modules/git/example.expected/platform_win.json index 7573c6f4a..040a832b0 100644 --- a/recipe_modules/git/example.expected/platform_win.json +++ b/recipe_modules/git/example.expected/platform_win.json @@ -9,14 +9,14 @@ "--url", "https://chromium.googlesource.com/chromium/src.git", "--git_cmd_path", - "RECIPE_PACKAGE[depot_tools]\\git.bat" + "[DEPOT_TOOLS]\\git.bat" ], "cwd": "[SLAVE_BUILD]", "name": "git setup" }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "retry", "fetch", "origin", @@ -28,7 +28,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "checkout", "-f", "FETCH_HEAD" @@ -38,7 +38,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "rev-parse", "HEAD" ], @@ -51,7 +51,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "clean", "-f", "-d", @@ -62,7 +62,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "submodule", "sync" ], @@ -71,7 +71,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "submodule", "update", "--init", @@ -82,7 +82,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "-c", "foo=bar", "count-objects", @@ -94,7 +94,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "config", "--get", "remote.origin.url" @@ -108,7 +108,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "show", "HEAD", "--format=%at", @@ -120,7 +120,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "fetch", "origin", "--tags" @@ -130,7 +130,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "status" ], "cwd": "[SLAVE_BUILD]\\src", @@ -138,7 +138,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "status" ], "cwd": "[SLAVE_BUILD]\\src", @@ -146,7 +146,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "status" ], "cwd": "[SLAVE_BUILD]\\src", @@ -154,7 +154,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "rebase", "origin/master" ], @@ -163,7 +163,7 @@ }, { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "bundle", "create", "[SLAVE_BUILD]\\all.bundle", diff --git a/recipe_modules/tryserver/example.expected/with_wrong_patch.json b/recipe_modules/tryserver/example.expected/with_wrong_patch.json index c063c86c6..686dc4300 100644 --- a/recipe_modules/tryserver/example.expected/with_wrong_patch.json +++ b/recipe_modules/tryserver/example.expected/with_wrong_patch.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "RECIPE_PACKAGE[depot_tools]\\git.bat", + "[DEPOT_TOOLS]\\git.bat", "diff", "--cached", "--name-only"