android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reload the correct manifest during sync.

Browse Source 
Fix for issue #134
https://code.google.com/p/git-repo/issues/detail?id=134

Change-Id: I94c2dea5dd63917e3f9c90cbd628921d7d61b12a
This commit is contained in:
Tim Kilbourn 2013-03-08 15:02:49 -08:00
parent 3cba0b8613
commit 07669002cb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
subcmds/sync.py
View File

@ -372,6 +372,13 @@ later is required to fix a server side protocol bug.
print('\nerror: Exited sync due to gc errors', file=sys.stderr) print('\nerror: Exited sync due to gc errors', file=sys.stderr)
sys.exit(1) sys.exit(1)
def _ReloadManifest(self, manifest_name=None):
if manifest_name:
# Override calls _Unload already
self.manifest.Override(manifest_name)
else:
self.manifest._Unload()
def UpdateProjectList(self): def UpdateProjectList(self):
new_project_paths = [] new_project_paths = []
for project in self.GetProjects(None, missing_ok=True): for project in self.GetProjects(None, missing_ok=True):
@ -571,7 +578,7 @@ later is required to fix a server side protocol bug.
mp.Sync_LocalHalf(syncbuf) mp.Sync_LocalHalf(syncbuf)
if not syncbuf.Finish(): if not syncbuf.Finish():
sys.exit(1) sys.exit(1)
self.manifest._Unload() self._ReloadManifest(opt.manifest_name)
if opt.jobs is None: if opt.jobs is None:
self.jobs = self.manifest.default.sync_j self.jobs = self.manifest.default.sync_j
all_projects = self.GetProjects(args, all_projects = self.GetProjects(args,
@ -596,7 +603,7 @@ later is required to fix a server side protocol bug.
# Iteratively fetch missing and/or nested unregistered submodules # Iteratively fetch missing and/or nested unregistered submodules
previously_missing_set = set() previously_missing_set = set()
while True: while True:
self.manifest._Unload() self._ReloadManifest(opt.manifest_name)
all_projects = self.GetProjects(args, all_projects = self.GetProjects(args,
missing_ok=True, missing_ok=True,
submodules_ok=opt.fetch_submodules) submodules_ok=opt.fetch_submodules)