sync: Correctly sync multi manifest workspaces

When actually fetching the manifests, start at the correct (sub)
manifest.

Bug: https://crbug.com/gerrit/16198
Change-Id: I39fdd726f1917ef4277a0b7c83663c8f49167466
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/343914
Tested-by: LaMont Jones <lamontjones@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
LaMont Jones 2022-08-24 17:32:25 +00:00
parent fbd5dd3a30
commit 4112c07688

View File

@ -1071,14 +1071,13 @@ later is required to fix a server side protocol bug.
file=sys.stderr) file=sys.stderr)
for m in self.ManifestList(opt): for m in self.ManifestList(opt):
mp = m.manifestProject if not m.manifestProject.standalone_manifest_url:
is_standalone_manifest = bool(mp.standalone_manifest_url) m.manifestProject.PreSync()
if not is_standalone_manifest:
mp.PreSync()
if opt.repo_upgraded: if opt.repo_upgraded:
_PostRepoUpgrade(m, quiet=opt.quiet) _PostRepoUpgrade(manifest, quiet=opt.quiet)
mp = manifest.manifestProject
if opt.mp_update: if opt.mp_update:
self._UpdateAllManifestProjects(opt, mp, manifest_name) self._UpdateAllManifestProjects(opt, mp, manifest_name)
else: else: