diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 8cba086a24..4b4923c239 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "7c33aeefa596b8af9fd017e591e3e5a4db47abb4", + "revision": "c02bbc83a32cb6edb9de4a0a108ed1934075bc88", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 62dcbc063e..2dcd39d5ff 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1061,23 +1061,23 @@ Move things around in a loop! — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):** -[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7c33aeefa596b8af9fd017e591e3e5a4db47abb4/recipe_engine/recipe_api.py#878 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c02bbc83a32cb6edb9de4a0a108ed1934075bc88/recipe_engine/recipe_api.py#878 diff --git a/recipes/recipes.py b/recipes/recipes.py index 4e37b9cf8e..b8ff419a8e 100755 --- a/recipes/recipes.py +++ b/recipes/recipes.py @@ -131,7 +131,6 @@ def _subprocess_call(argv, **kwargs): return subprocess.call(argv, **kwargs) - def _git_check_call(argv, **kwargs): argv = [GIT] + argv logging.info('Running %r', argv) @@ -204,7 +203,8 @@ def checkout_engine(engine_path, repo_root, recipes_cfg_path): os.remove(index_lock) except OSError as exc: if exc.errno != errno.EEXIST: - logging.warn('failed to remove %r, reset will fail: %s', index_lock, exc) + logging.warn('failed to remove %r, reset will fail: %s', index_lock, + exc) _git_check_call(['reset', '-q', '--hard', revision], cwd=engine_path) # If the engine has refactored/moved modules we need to clean all .pyc files @@ -241,8 +241,8 @@ def main(): engine_path = checkout_engine(engine_override, repo_root, recipes_cfg_path) argv = ( - [VPYTHON, '-u', os.path.join(engine_path, 'recipe_engine', 'main.py')] + - args) + [VPYTHON, '-u', + os.path.join(engine_path, 'recipe_engine', 'main.py')] + args) if IS_WIN: # No real 'exec' on windows; set these signals to ignore so that they