Explorar o código

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>
Martin Kelly %!s(int64=8) %!d(string=hai) anos
pai
achega
224a31a765
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 2 2
      project.py
  2. 1 1
      subcmds/init.py

+ 2 - 2
project.py

@@ -2958,14 +2958,14 @@ class MetaProject(Project):
           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,

+ 1 - 1
subcmds/init.py

@@ -256,7 +256,7 @@ to update the working directory files.
       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)