Fix multi-solution use case with conflicting custom_deps overrides.

Fix multi-solution use case with conflicting custom_deps overrides.

Let's say there's 2 solutions, solA and solB, both fetching the dependency depA
with different urls, solA has 'depA': 'http://foo/bar' and solB has 'depA':
From('depB', 'bar').

This case used to not work, because LateOverride() was not called in
verify_validity(), so it was not comparing the resolved urls but instead what is
textually specified in both DEPS files.

Also because LateOverride() was not called, verify_validity() was comparing the
original urls even if custom_deps is specified in the solution(s).

Finally, allow one to mismatch the other IFF one is None.

R=szager@chromium.org
BUG=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=161228

[szager1, 2012-10-09 18:30:11]

https://codereview.chromium.org/11088023/diff/1/gclient.py
File gclient.py (right):

https://codereview.chromium.org/11088023/diff/1/gclient.py#newcode330
gclient.py:330: if self_url != sibling_url:
if self_url and sibling_url and self_url != sibling_url

That would change the behavior for empty string; not sure how you want to handle
that.

[M-A Ruel, 2012-10-09 18:38:22]

https://codereview.chromium.org/11088023/diff/1/gclient.py
File gclient.py (right):

https://codereview.chromium.org/11088023/diff/1/gclient.py#newcode330
gclient.py:330: if self_url != sibling_url:
On 2012/10/09 18:30:11, szager1 wrote:
> if self_url and sibling_url and self_url != sibling_url
> 
> That would change the behavior for empty string; not sure how you want to
handle
> that.

Agreed, I changed it.

[szager1, 2012-10-09 18:42:22]

lgtm

[commit-bot: I haz the power, 2012-10-10 23:23:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/maruel@chromium.org/11088023/3002

[commit-bot: I haz the power, 2012-10-10 23:25:52]

Change committed as 161228