Commit d1de725e authored by John Budorick's avatar John Budorick Committed by Commit Bot

gclient: Prevent unprocessed deps from overriding processed ones in sync output.

Bug: 842235
Change-Id: Ie1a00b19a7ebb99dbac4a86562d4eb31493c216d
Reviewed-on: https://chromium-review.googlesource.com/1055683
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: 's avatarAndrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: 's avatarMichael Moss <mmoss@chromium.org>
Reviewed-by: 's avatarEdward Lesmes <ehmaldonado@chromium.org>
parent fafa09db
......@@ -2771,6 +2771,10 @@ def CMDsync(parser, args):
slns = {}
for d in client.subtree(True):
normed = d.name.replace('\\', '/').rstrip('/') + '/'
if normed in slns and not d.should_process:
# If an unprocessed dependency would override an existing dependency,
# ignore it.
continue
slns[normed] = {
'revision': d.got_revision,
'scm': d.used_scm.name if d.used_scm else None,
......
......@@ -5,4 +5,4 @@ Once upon a time, a budding web browser dev team needed a CI system.
All they had was one poor machine under a desk, and its name was Batty,
the Build and Test Yeti.
The End
As the CI needs of the browser grew,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment