zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip cipd deps in roll_deps

Browse Source 
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 <oprypin@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22088}
This commit is contained in:
Oleh Prypin
2018-02-19 16:24:19 +01:00
committed by Commit Bot
parent 7435462940
commit 6e9c00f809
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools_webrtc/autoroller/roll_deps.py
View File

@ -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)