diff --git a/command.py b/command.py index c32a095cf..e74a94fa3 100644 --- a/command.py +++ b/command.py @@ -399,7 +399,7 @@ class Command: result = [] if not groups: - groups = manifest.GetGroupsStr() + groups = manifest.GetManifestGroupsStr() groups = [x for x in re.split(r"[,\s]+", groups) if x] if not args: diff --git a/git_superproject.py b/git_superproject.py index 14ba1547e..1ada173b7 100644 --- a/git_superproject.py +++ b/git_superproject.py @@ -422,7 +422,8 @@ class Superproject: ) return None manifest_str = self._manifest.ToXml( - filter_groups=self._manifest.GetGroupsStr(), omit_local=True + filter_groups=self._manifest.GetManifestGroupsStr(), + omit_local=True, ).toxml() manifest_path = self._manifest_path try: diff --git a/manifest_xml.py b/manifest_xml.py index 30b806e3c..7987061d6 100644 --- a/manifest_xml.py +++ b/manifest_xml.py @@ -1122,7 +1122,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md groups += f",platform-{platform.system().lower()}" return groups - def GetGroupsStr(self): + def GetManifestGroupsStr(self): """Returns the manifest group string that should be synced.""" return ( self.manifestProject.manifest_groups or self.GetDefaultGroupsStr() diff --git a/subcmds/info.py b/subcmds/info.py index 2fbdae057..c5291cf2e 100644 --- a/subcmds/info.py +++ b/subcmds/info.py @@ -88,7 +88,7 @@ class Info(PagedCommand): self.manifest = self.manifest.outer_client manifestConfig = self.manifest.manifestProject.config mergeBranch = manifestConfig.GetBranch("default").merge - manifestGroups = self.manifest.GetGroupsStr() + manifestGroups = self.manifest.GetManifestGroupsStr() self.heading("Manifest branch: ") if self.manifest.default.revisionExpr: diff --git a/tests/test_manifest_xml.py b/tests/test_manifest_xml.py index 0cd84f081..039921f65 100644 --- a/tests/test_manifest_xml.py +++ b/tests/test_manifest_xml.py @@ -639,10 +639,10 @@ class ProjectElementTests(ManifestParseTestCase): {"g1", "g2", "name:extras", "all", "path:path"}, ) groupstr = "default,platform-" + platform.system().lower() - self.assertEqual(groupstr, manifest.GetGroupsStr()) + self.assertEqual(groupstr, manifest.GetManifestGroupsStr()) groupstr = "g1,g2,g1" manifest.manifestProject.config.SetString("manifest.groups", groupstr) - self.assertEqual(groupstr, manifest.GetGroupsStr()) + self.assertEqual(groupstr, manifest.GetManifestGroupsStr()) def test_set_revision_id(self): """Check setting of project's revisionId."""