commit 224a31a765eb943443640301a715d2d4eb005b79
author Martin Kelly <mkelly@xevo.com> Mon Jul 10 14:46:25 2017 -0700
committer Martin Kelly <mkelly@xevo.com> Mon Jul 10 14:50:52 2017 -0700
tree e32deed53d2576e43f8250d22c2a0e44f7e5d558
parent b54343d9fd682bcdb1510042d93fdf38979b9eb7

init: add missing submodule arg

The submodule argument to Sync_LocalHalf was missing in
MetaBranchSwitch, causing submodules not to get synced when the
-b/--manifest-branch argument to init is used.

Change-Id: Ie86d271abac2020725770be36ead83be3326e64b
Signed-off-by: Martin Kelly <mkelly@xevo.com>

project.py

diff --git a/project.py b/project.py
index 269fd7e..9a79527 100644
--- a/project.py
+++ b/project.py
@@ -2958,14 +2958,14 @@
           self.revisionExpr = base
           self.revisionId = None
 
-  def MetaBranchSwitch(self):
+  def MetaBranchSwitch(self, submodules=False):
     """ Prepare MetaProject for manifest branch switch
     """
 
     # detach and delete manifest branch, allowing a new
     # branch to take over
     syncbuf = SyncBuffer(self.config, detach_head=True)
-    self.Sync_LocalHalf(syncbuf)
+    self.Sync_LocalHalf(syncbuf, submodules=submodules)
     syncbuf.Finish()
 
     return GitCommand(self,

subcmds/init.py

diff --git a/subcmds/init.py b/subcmds/init.py
index 65dfd1f..46cdd23 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -256,7 +256,7 @@
       sys.exit(1)
 
     if opt.manifest_branch:
-      m.MetaBranchSwitch()
+      m.MetaBranchSwitch(submodules=opt.submodules)
 
     syncbuf = SyncBuffer(m.config)
     m.Sync_LocalHalf(syncbuf, submodules=opt.submodules)