Fix "gclient sync" not recursing nested repo set as @unmanaged in custom_deps

Bug: 1031185
Change-Id: I09ba4dcc0aaf67d08e1526bd80b036225fe59e74
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1959814
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
changes/14/1959814/5
Andrew Grieve 4 years ago committed by LUCI CQ
parent cc0f7a5170
commit e8f9bdc197

@ -618,7 +618,13 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
# this line to the solution. # this line to the solution.
for dep_name, dep_info in self.custom_deps.items(): for dep_name, dep_info in self.custom_deps.items():
if dep_name not in deps: if dep_name not in deps:
deps[dep_name] = {'url': dep_info, 'dep_type': 'git'} # Don't add it to the solution for the values of "None" and "unmanaged"
# in order to force these kinds of custom_deps to act as revision
# overrides (via revision_overrides). Having them function as revision
# overrides allows them to be applied to recursive dependencies.
# https://crbug.com/1031185
if dep_info and not dep_info.endswith('@unmanaged'):
deps[dep_name] = {'url': dep_info, 'dep_type': 'git'}
# Make child deps conditional on any parent conditions. This ensures that, # Make child deps conditional on any parent conditions. This ensures that,
# when flattened, recursed entries have the correct restrictions, even if # when flattened, recursed entries have the correct restrictions, even if

Loading…
Cancel
Save