Merge commits up to v2.15.3
* tag 'v2.15.3':
sync: Sync submodules correctly again
Change-Id: Iee6280bc0e9fc69309a5dd87606ac88c8ab6e966
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 0f00ca5..fd95103 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -475,11 +475,14 @@
Args:
opt: Program options returned from optparse. See _Options().
args: Command line args used to filter out projects.
- all_projects: List of all projects that should be checked out.
+ all_projects: List of all projects that should be fetched.
err_event: Whether an error was hit while processing.
manifest_name: Manifest file to be reloaded.
load_local_manifests: Whether to load local manifests.
ssh_proxy: SSH manager for clients & masters.
+
+ Returns:
+ List of all projects that should be checked out.
"""
rp = self.manifest.repoProject
@@ -526,6 +529,8 @@
err_event.set()
fetched.update(new_fetched)
+ return all_projects
+
def _CheckoutOne(self, detach_head, force_sync, project):
"""Checkout work tree for one project
@@ -1025,8 +1030,9 @@
with ssh.ProxyManager(manager) as ssh_proxy:
# Initialize the socket dir once in the parent.
ssh_proxy.sock()
- self._FetchMain(opt, args, all_projects, err_event, manifest_name,
- load_local_manifests, ssh_proxy)
+ all_projects = self._FetchMain(opt, args, all_projects, err_event,
+ manifest_name, load_local_manifests,
+ ssh_proxy)
if opt.network_only:
return