diff options
| author | Patrik Höglund <phoglund@chromium.org> | 2018-01-02 11:26:12 +0100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-01-02 23:54:24 +0000 |
| commit | 8db1c985ab8255c112a6012b8de0f671f771923c (patch) | |
| tree | fbdec7fa967f38cbfcb3cef136f3419b65f35fbc /tools_libyuv | |
| parent | 1e4600be3b0ae69064563896ddd9b2b5997436d0 (diff) | |
| download | libyuv-8db1c985ab8255c112a6012b8de0f671f771923c.tar.gz | |
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 <fbarchard@chromium.org>
Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Diffstat (limited to 'tools_libyuv')
| -rwxr-xr-x | tools_libyuv/autoroller/roll_deps.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools_libyuv/autoroller/roll_deps.py b/tools_libyuv/autoroller/roll_deps.py index efea81e0..09ddc40e 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) |