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/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1
6001414 (iannucci@chromium.org)
Apply index.lock 'fix' within recipes.py.
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: I09c4e12932935cce11b324571dcedd25d034b067
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2277236
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 64b5ea7..95c7118 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -16,7 +16,7 @@
"deps": {
"recipe_engine": {
"branch": "master",
- "revision": "7317229d124b984f15d159dcee401f93afe28613",
+ "revision": "600141463e0dbd42112f32fe587c2a84e5b8b9c1",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},
diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md
index 9bcb66f..0651b79 100644
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@@ -1036,20 +1036,20 @@
— **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):**
-[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-buildbucket
-[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-cipd
-[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-commit_position
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-cq
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-python
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-runtime
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-url
-[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/README.recipes.md#recipe_modules-version
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7317229d124b984f15d159dcee401f93afe28613/recipe_engine/recipe_api.py#801
+[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-buildbucket
+[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-cipd
+[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-commit_position
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-cq
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-python
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-runtime
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-url
+[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/README.recipes.md#recipe_modules-version
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/600141463e0dbd42112f32fe587c2a84e5b8b9c1/recipe_engine/recipe_api.py#801
diff --git a/recipes/recipes.py b/recipes/recipes.py
index c6b37ae..c87581f 100755
--- a/recipes/recipes.py
+++ b/recipes/recipes.py
@@ -25,6 +25,7 @@
# pylint: disable=wrong-import-position
import argparse
+import errno
import json
import logging
import os
@@ -195,6 +196,12 @@
try:
_git_check_call(['diff', '--quiet', revision], cwd=engine_path)
except subprocess.CalledProcessError:
+ index_lock = os.path.join(engine_path, '.git', 'index.lock')
+ try:
+ 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)
_git_check_call(['reset', '-q', '--hard', revision], cwd=engine_path)
# If the engine has refactored/moved modules we need to clean all .pyc files
