From d56e2eb4216827284220fcc35af42e60b4faaea6 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Thu, 7 Apr 2022 18:14:46 +0000 Subject: manifest_xml: use Superproject to hold XML content Always create Superproject when there is a tag, and have it hold the XML content, similar to how other manifest elements are handled. This also adds SetQuiet and SetPrintMessages to Superproject consistent with manifest.SetUseLocalManifests. Change-Id: I522bf3da542006575799f0640c67f7052704f266 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/334641 Reviewed-by: Mike Frysinger Reviewed-by: Raman Tenneti Tested-by: LaMont Jones --- subcmds/sync.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'subcmds/sync.py') diff --git a/subcmds/sync.py b/subcmds/sync.py index 9e783205..4d0a5ec6 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -304,12 +304,10 @@ later is required to fix a server side protocol bug. Returns: Returns path to the overriding manifest file instead of None. """ + superproject = self.manifest.superproject + superproject.SetQuiet(opt.quiet) print_messages = git_superproject.PrintMessages(opt, self.manifest) - superproject = git_superproject.Superproject(self.manifest, - self.repodir, - self.git_event_log, - quiet=opt.quiet, - print_messages=print_messages) + superproject.SetPrintMessages(print_messages) if opt.local_only: manifest_path = superproject.manifest_path if manifest_path: @@ -319,7 +317,8 @@ later is required to fix a server side protocol bug. all_projects = self.GetProjects(args, missing_ok=True, submodules_ok=opt.fetch_submodules) - update_result = superproject.UpdateProjectsRevisionId(all_projects) + update_result = superproject.UpdateProjectsRevisionId( + all_projects, git_event_log=self.git_event_log) manifest_path = update_result.manifest_path superproject_logging_data['updatedrevisionid'] = bool(manifest_path) if manifest_path: -- cgit v1.2.3-54-g00ecf