From 69a239e477c6686ca5ecff03e3bbfa1dbf09c9cd Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Mon, 8 May 2017 22:36:16 -0700 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/497f5b7f92cea8e5273d56cc3cba876fb18b42d9 [doc/recipes.py] fix issue when running recipes.py from . (iannucci@chromium.org) TBR=iannucci@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I6bae466acee1d5131d689a01803780dbea2ca174 Reviewed-on: https://chromium-review.googlesource.com/499929 Reviewed-by: Commit-Queue: --- infra/config/recipes.cfg | 2 +- recipes/recipes.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index e124234b2..a54cdcfbc 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -15,7 +15,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "e90c11af854574dd68edd0e7c7a5e04ceb49ffd0", + "revision": "497f5b7f92cea8e5273d56cc3cba876fb18b42d9", "url": "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git" } }, diff --git a/recipes/recipes.py b/recipes/recipes.py index 9d8a87660..7215a0606 100755 --- a/recipes/recipes.py +++ b/recipes/recipes.py @@ -190,7 +190,7 @@ def main(): repo_root = os.path.abspath( _git_output(['rev-parse', '--show-toplevel'], - cwd=os.path.dirname(__file__)).strip()) + cwd=os.path.abspath(os.path.dirname(__file__))).strip()) # TODO(iannucci): Actually make the location of recipes.cfg configurable. recipes_cfg_path = os.path.join(repo_root, 'infra', 'config', 'recipes.cfg')