diff --git a/recipe_modules/gclient/api.py b/recipe_modules/gclient/api.py index b52dcd9db..e93de3661 100644 --- a/recipe_modules/gclient/api.py +++ b/recipe_modules/gclient/api.py @@ -91,7 +91,7 @@ class GclientApi(recipe_api.RecipeApi): prefix = ('[spec: %s] ' % self.spec_alias) + prefix return self.m.python(prefix + name, - self.m.path['depot_tools'].join('gclient.py'), + self.package_resource('gclient.py'), cmd, infra_step=infra_step, **kwargs) diff --git a/recipe_modules/gclient/example.expected/basic.json b/recipe_modules/gclient/example.expected/basic.json index 93f74535d..15d9d2f40 100644 --- a/recipe_modules/gclient/example.expected/basic.json +++ b/recipe_modules/gclient/example.expected/basic.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "config", "--spec", "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]" @@ -15,7 +15,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "sync", "--verbose", "--with_branch_heads", @@ -46,7 +46,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "recurse", "git", "config", @@ -60,7 +60,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "recurse", "git", "config", @@ -74,7 +74,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "config", "--spec", "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" @@ -86,7 +86,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "sync", "--nohooks", "--force", @@ -143,7 +143,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "runhooks" ], "cwd": "[SLAVE_BUILD]", diff --git a/recipe_modules/gclient/example.expected/revision.json b/recipe_modules/gclient/example.expected/revision.json index dd2925cd5..3875852ab 100644 --- a/recipe_modules/gclient/example.expected/revision.json +++ b/recipe_modules/gclient/example.expected/revision.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "config", "--spec", "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]" @@ -15,7 +15,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "sync", "--verbose", "--with_branch_heads", @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "recurse", "git", "config", @@ -62,7 +62,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "recurse", "git", "config", @@ -76,7 +76,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "config", "--spec", "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" @@ -88,7 +88,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "sync", "--nohooks", "--force", @@ -145,7 +145,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "runhooks" ], "cwd": "[SLAVE_BUILD]", diff --git a/recipe_modules/gclient/example.expected/tryserver.json b/recipe_modules/gclient/example.expected/tryserver.json index c98d090d4..35e983e84 100644 --- a/recipe_modules/gclient/example.expected/tryserver.json +++ b/recipe_modules/gclient/example.expected/tryserver.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "config", "--spec", "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]" @@ -15,7 +15,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "sync", "--verbose", "--with_branch_heads", @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "recurse", "git", "config", @@ -62,7 +62,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "recurse", "git", "config", @@ -76,7 +76,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "config", "--spec", "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]" @@ -99,7 +99,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "sync", "--nohooks", "--force", @@ -156,7 +156,7 @@ "cmd": [ "python", "-u", - "[DEPOT_TOOLS]/gclient.py", + "RECIPE_PACKAGE[depot_tools]/gclient.py", "runhooks" ], "cwd": "[SLAVE_BUILD]",