From 73c81759cb07f1a68d907bc3f03d90d63aabfb10 Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Fri, 22 Sep 2017 18:14:56 +0200 Subject: [PATCH] Fix autoroller script. http://crrev.com/9f8b8eb2 introduced deps conditional on a variable, we don't need to support this, so we just continue when we encounter a dict. NOTRY=True Bug: None Change-Id: I9ce22cbfd1b3ae02b4a48c9c8312a08a904f9291 Reviewed-on: https://webrtc-review.googlesource.com/2688 Reviewed-by: Charu Jain Reviewed-by: Henrik Kjellander Commit-Queue: Henrik Kjellander Cr-Commit-Position: refs/heads/master@{#19930} --- tools_webrtc/autoroller/roll_deps.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index 0b1279a68c..523caba4dd 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -210,7 +210,11 @@ def BuildDepsentryDict(deps_dict): result = {} def AddDepsEntries(deps_subdict): for path, deps_url in deps_subdict.iteritems(): - if not result.has_key(path): + if isinstance(deps_url, dict): + # We don't support deps conditional on a variable. + # This is needed after http://crrev.com/9f8b8eb2 + continue + elif not result.has_key(path): url, revision = deps_url.split('@') if deps_url else (None, None) result[path] = DepsEntry(path, url, revision)