admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix autoroller script.

Browse Source 
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 <charujain@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Commit-Queue: Henrik Kjellander <kjellander@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19930}
This commit is contained in:
Edward Lemur 2017-09-22 18:14:56 +02:00 committed by Commit Bot
parent 2397b9a114
commit 73c81759cb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools_webrtc/autoroller/roll_deps.py
View File

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