From 6e9c00f8094c426f4e75b7f67add898b828142a1 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Mon, 19 Feb 2018 16:24:19 +0100 Subject: [PATCH] Skip cipd deps in roll_deps This should be seen as a temporary workaround because we will likely want to roll these together with Chromium and drop 'Android CIPD Ensure' like in crrev.com/b59866870a96d6dd39cf573e304ca551848520b9 but it's difficult to update a Python-syntax file like that. Bug: chromium:755920 No-Try: True TBR: phoglund@webrtc.org Change-Id: Ifc508c48ea29ce570cf624d783fa22381ea03fd4 Reviewed-on: https://webrtc-review.googlesource.com/54902 Reviewed-by: Oleh Prypin Commit-Queue: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#22088} --- tools_webrtc/autoroller/roll_deps.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index 24ca18beb3..7d57a0f0af 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -208,9 +208,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(): - if isinstance(deps_url, dict): - deps_url = deps_url['url'] + for path, dep in deps_subdict.iteritems(): + if isinstance(dep, dict): + if dep.get('dep_type') == 'cipd': + continue + deps_url = dep['url'] + else: + deps_url = dep if not result.has_key(path): url, revision = deps_url.split('@') if deps_url else (None, None) result[path] = DepsEntry(path, url, revision)