From a8cf575d68e7e211292d967f4a12cf609a028b20 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Fri, 15 Jul 2022 20:31:33 +0000 Subject: Omit local_manifest groups from superproject override. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When we create superproject_override.xml, do not include projects that are present from local_manifests/*. Such projects are fully under the control of the local_manifests/ file. Bug: b/238934278 Test: manual, ./run_tests Change-Id: I40382ceb82d9cf7b8dc7b5f2abed3f6d4d80017e Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/340877 Tested-by: Xin Li Reviewed-by: Xin Li Reviewed-by: Sam Saccone 🐐 --- git_superproject.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'git_superproject.py') diff --git a/git_superproject.py b/git_superproject.py index 5d00bd72..8b6bbcf9 100644 --- a/git_superproject.py +++ b/git_superproject.py @@ -295,7 +295,8 @@ class Superproject(object): if not os.path.exists(self._superproject_path): self._LogWarning(f'missing superproject directory: {self._superproject_path}') return None - manifest_str = self._manifest.ToXml(groups=self._manifest.GetGroupsStr()).toxml() + manifest_str = self._manifest.ToXml(groups=self._manifest.GetGroupsStr(), + omit_local=True).toxml() manifest_path = self._manifest_path try: with open(manifest_path, 'w', encoding='utf-8') as fp: -- cgit v1.2.3-54-g00ecf