From 8db1c985ab8255c112a6012b8de0f671f771923c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20H=C3=B6glund?= Date: Tue, 2 Jan 2018 11:26:12 +0100 Subject: [PATCH] Update roll script to allow advanced url specs, update catapult repo. Bug: libyuv:768 Test: git checkout master && tools_libyuv/autoroller/roll_deps.py Change-Id: I55f21382cb947ecff2078eb9a0fa5572ceee64b5 Reviewed-on: https://chromium-review.googlesource.com/847001 Commit-Queue: Frank Barchard Reviewed-by: Frank Barchard --- DEPS | 2 +- tools_libyuv/autoroller/roll_deps.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index fdb133c7a..70575242b 100644 --- a/DEPS +++ b/DEPS @@ -22,7 +22,7 @@ deps = { 'src/third_party': Var('chromium_git') + '/chromium/src/third_party' + '@' + '72c52c224cdd3c377f7caff8ffed0f5749e79549', 'src/third_party/catapult': - Var('chromium_git') + '/external/github.com/catapult-project/catapult.git' + '@' + Var('catapult_revision'), + Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'), 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/googletest/src': diff --git a/tools_libyuv/autoroller/roll_deps.py b/tools_libyuv/autoroller/roll_deps.py index efea81e07..09ddc40e7 100755 --- a/tools_libyuv/autoroller/roll_deps.py +++ b/tools_libyuv/autoroller/roll_deps.py @@ -207,7 +207,13 @@ def BuildDepsentryDict(deps_dict): """Builds a dict of paths to DepsEntry objects from a raw parsed deps dict.""" result = {} def AddDepsEntries(deps_subdict): - for path, deps_url in deps_subdict.iteritems(): + for path, deps_url_spec in deps_subdict.iteritems(): + # The deps url is either an URL and a condition, or just the URL. + if isinstance(deps_url_spec, dict): + deps_url = deps_url_spec['url'] + else: + deps_url = deps_url_spec + if not result.has_key(path): url, revision = deps_url.split('@') if deps_url else (None, None) result[path] = DepsEntry(path, url, revision)