From a28b14f122463a6d73c623e77c9dea4e228322dc Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Thu, 21 Jun 2018 01:24:29 +0000 Subject: [PATCH] Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. recipe_engine: https://crrev.com/0e71eb80de4e88898496b6dcc752ca9554c0433c Remove all bootstrapping logic from recipe engine. (iannucci@chromium.org) https://crrev.com/59ce6b333bae640882c70e5eb79a3f37662925f4 Do not rely on recipes.py to update recipe_engine. (iannucci@chromium.org) TBR=iannucci@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I6c683261f5fd7909be761557e6ec41c697868945 Reviewed-on: https://chromium-review.googlesource.com/1109392 Reviewed-by: Recipe Roller Commit-Queue: Recipe Roller --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 26 +++++++++++++------------- recipes/recipes.py | 6 ++++-- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index a8295534f..d7328357f 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -15,7 +15,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb", + "revision": "59ce6b333bae640882c70e5eb79a3f37662925f4", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index b5594e250..b091dc418 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -804,16 +804,16 @@ Move things around in a loop! — **def [RunSteps](/recipes/recipe_modules/tryserver/examples/full.py#17)(api):** -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-source_manifest -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/README.recipes.md#recipe_modules-url -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb/recipe_engine/recipe_api.py#1006 +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-source_manifest +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/README.recipes.md#recipe_modules-url +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/59ce6b333bae640882c70e5eb79a3f37662925f4/recipe_engine/recipe_api.py#1006 diff --git a/recipes/recipes.py b/recipes/recipes.py index fe6589d6f..d726c6897 100755 --- a/recipes/recipes.py +++ b/recipes/recipes.py @@ -107,7 +107,9 @@ def parse(repo_root, recipes_cfg_path): raise MalformedRecipesCfg(ex.message, recipes_cfg_path) -GIT = 'git.bat' if sys.platform.startswith(('win', 'cygwin')) else 'git' +_BAT = '.bat' if sys.platform.startswith(('win', 'cygwin')) else '' +GIT = 'git' + _BAT +VPYTHON = 'vpython' + _BAT def _subprocess_call(argv, **kwargs): @@ -208,7 +210,7 @@ def main(): engine_path = checkout_engine(engine_override, repo_root, recipes_cfg_path) return _subprocess_call([ - sys.executable, '-u', + VPYTHON, '-u', os.path.join(engine_path, 'recipes.py')] + args)