From b496b6a0570bd4c9be2c1034ae1b5ae4360b327b Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Thu, 17 May 2018 13:57:43 -0400 Subject: [PATCH] gclient: Fix roll-dep. Bug: 839925 Change-Id: I5a56ad03866bd0b8f7d43bb3a643372d7b66343c Reviewed-on: https://chromium-review.googlesource.com/1064692 Reviewed-by: Aaron Gable Commit-Queue: Edward Lesmes --- recipes/trigger_recipe_roller.txt | 3 ++- roll_dep.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/trigger_recipe_roller.txt b/recipes/trigger_recipe_roller.txt index 3dc3d6cd2..ad33af67b 100644 --- a/recipes/trigger_recipe_roller.txt +++ b/recipes/trigger_recipe_roller.txt @@ -5,4 +5,5 @@ Once upon a time, a budding web browser dev team needed a CI system. All they had was one poor machine under a desk, and its name was Batty, the Build and Test Yeti. -As the CI needs of the browser grew, Batty, the Build and Test Yeti, +As the CI needs of the browser grew, Batty, the Build and Test Yeti, got +a new friend: diff --git a/roll_dep.py b/roll_dep.py index 3c09f7af9..411dd9cb8 100755 --- a/roll_dep.py +++ b/roll_dep.py @@ -225,7 +225,7 @@ def main(): # First gather all the information without modifying anything, except for a # git fetch. deps_path, deps_content = get_deps(current_dir) - gclient_dict = gclient_eval.Parse(deps_content, True, True, deps_path) + gclient_dict = gclient_eval.Exec(deps_content, True, True, deps_path) is_relative = gclient_dict.get('use_relative_paths', False) root_dir = current_dir if is_relative else gclient_root rolls = {}