From e816b5197f5e74d0744402654b8dc62daf0a3d19 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Wed, 30 Sep 2020 16:10:40 +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 (recipe_engine) into this repository. recipe_engine: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f e47e115 (olivernewman@google.com) [recipes.py] Use correct errno for index.lock check More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. TBR=iannucci@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I93598c182c8fc6b459dfc2fdc9e93165a7c2b8fd Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2440118 Reviewed-by: Recipe Roller Commit-Queue: Recipe Roller --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 40 +++++++++++++++++++-------------------- recipes/recipes.py | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 4386cf53a..903c430d1 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "40fa48addae245495e35c2fc82aa522d7f1d05da", + "revision": "e47e1156a8e28a697e3ac311164fc0071b43c72f", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index cc308ab9c..d44ad19d5 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/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/40fa48addae245495e35c2fc82aa522d7f1d05da/recipe_engine/recipe_api.py#877 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/e47e1156a8e28a697e3ac311164fc0071b43c72f/recipe_engine/recipe_api.py#877 diff --git a/recipes/recipes.py b/recipes/recipes.py index b8ff419a8..9b13aa570 100755 --- a/recipes/recipes.py +++ b/recipes/recipes.py @@ -202,7 +202,7 @@ def checkout_engine(engine_path, repo_root, recipes_cfg_path): try: os.remove(index_lock) except OSError as exc: - if exc.errno != errno.EEXIST: + if exc.errno != errno.ENOENT: logging.warn('failed to remove %r, reset will fail: %s', index_lock, exc) _git_check_call(['reset', '-q', '--hard', revision], cwd=engine_path)