diff options
author | LaMont Jones <lamontjones@google.com> | 2022-07-15 20:31:33 +0000 |
---|---|---|
committer | LaMont Jones <lamontjones@google.com> | 2022-07-15 23:32:24 +0000 |
commit | a8cf575d68e7e211292d967f4a12cf609a028b20 (patch) | |
tree | 8aa89d12dde6b24228187bf71bdadaa97f59af49 /git_superproject.py | |
parent | 8501d4602a4c85f1e22c7a51ad191af8166efecd (diff) | |
download | git-repo-a8cf575d68e7e211292d967f4a12cf609a028b20.tar.gz |
Omit local_manifest groups from superproject override.v2.28
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 <delphij@google.com>
Reviewed-by: Xin Li <delphij@google.com>
Reviewed-by: Sam Saccone 🐐 <samccone@google.com>
Diffstat (limited to 'git_superproject.py')
-rw-r--r-- | git_superproject.py | 3 |
1 files changed, 2 insertions, 1 deletions
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): | |||
295 | if not os.path.exists(self._superproject_path): | 295 | if not os.path.exists(self._superproject_path): |
296 | self._LogWarning(f'missing superproject directory: {self._superproject_path}') | 296 | self._LogWarning(f'missing superproject directory: {self._superproject_path}') |
297 | return None | 297 | return None |
298 | manifest_str = self._manifest.ToXml(groups=self._manifest.GetGroupsStr()).toxml() | 298 | manifest_str = self._manifest.ToXml(groups=self._manifest.GetGroupsStr(), |
299 | omit_local=True).toxml() | ||
299 | manifest_path = self._manifest_path | 300 | manifest_path = self._manifest_path |
300 | try: | 301 | try: |
301 | with open(manifest_path, 'w', encoding='utf-8') as fp: | 302 | with open(manifest_path, 'w', encoding='utf-8') as fp: |