diff options
author | LaMont Jones <lamontjones@google.com> | 2022-04-20 16:42:32 +0000 |
---|---|---|
committer | LaMont Jones <lamontjones@google.com> | 2022-04-29 18:42:23 +0000 |
commit | 501733c2abb1180679f25b2f78970d73a2f8d413 (patch) | |
tree | 61c04bb534130591e21a55abe1971ff9574c2938 /project.py | |
parent | 0165e20fcc4533ae0dc48531cfa9cbf3662cc999 (diff) | |
download | git-repo-501733c2abb1180679f25b2f78970d73a2f8d413.tar.gz |
manifest: add submanifest.default_groups attributev2.25
When the user does not specify any manifest groups, this allows the
parent manifest to indicate which manifest groups should be used for
syncing the submanifest.
Change-Id: I88806ed35013d13dd2ab3cd245fcd4f9061112c4
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/335474
Tested-by: LaMont Jones <lamontjones@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'project.py')
-rw-r--r-- | project.py | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -715,7 +715,8 @@ class Project(object): | |||
715 | The special manifest group "default" will match any project that | 715 | The special manifest group "default" will match any project that |
716 | does not have the special project group "notdefault" | 716 | does not have the special project group "notdefault" |
717 | """ | 717 | """ |
718 | expanded_manifest_groups = manifest_groups or ['default'] | 718 | default_groups = self.manifest.default_groups or ['default'] |
719 | expanded_manifest_groups = manifest_groups or default_groups | ||
719 | expanded_project_groups = ['all'] + (self.groups or []) | 720 | expanded_project_groups = ['all'] + (self.groups or []) |
720 | if 'notdefault' not in expanded_project_groups: | 721 | if 'notdefault' not in expanded_project_groups: |
721 | expanded_project_groups += ['default'] | 722 | expanded_project_groups += ['default'] |
@@ -3496,7 +3497,7 @@ class ManifestProject(MetaProject): | |||
3496 | """ | 3497 | """ |
3497 | assert _kwargs_only == (), 'Sync only accepts keyword arguments.' | 3498 | assert _kwargs_only == (), 'Sync only accepts keyword arguments.' |
3498 | 3499 | ||
3499 | groups = groups or 'default' | 3500 | groups = groups or self.manifest.GetDefaultGroupsStr(with_platform=False) |
3500 | platform = platform or 'auto' | 3501 | platform = platform or 'auto' |
3501 | git_event_log = git_event_log or EventLog() | 3502 | git_event_log = git_event_log or EventLog() |
3502 | if outer_manifest and self.manifest.is_submanifest: | 3503 | if outer_manifest and self.manifest.is_submanifest: |