kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-08-17 03:40:11 +02:00
Code Activity

Do submodules recursively, do init and update at the same time

Browse Source
This commit is contained in:
Daniel Martí 2014-01-28 23:49:36 +01:00
parent f054cf4973
commit c06fafdb6f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/fdroid.texi
View File

@ -820,8 +820,10 @@ Specifies to build from a subdirectory of the checked out source code.
Normally this directory is changed to before building, Normally this directory is changed to before building,
@item submodules=yes @item submodules=yes
Use if the project (git only) has submodules - causes git submodule Use if the project (git only) has submodules - causes @code{git submodule
init and update to be executed after the source is cloned. update --init --recursive} to be executed after the source is cloned.
Submodules are reset and cleaned like the main app repository itself before
each build.
@item init=xxxx @item init=xxxx
As for 'prebuild', but runs on the source code BEFORE any other processing As for 'prebuild', but runs on the source code BEFORE any other processing

6
fdroidserver/common.py
View File

@ -336,10 +336,8 @@ class vcs_git(vcs):
def initsubmodules(self): def initsubmodules(self):
self.checkrepo() self.checkrepo()
if subprocess.call(['git', 'submodule', 'init'], if subprocess.call(['git', 'submodule', 'update',
cwd=self.local) != 0: '--init', '--recursive'],
raise VCSException("Git submodule init failed")
if subprocess.call(['git', 'submodule', 'update'],
cwd=self.local) != 0: cwd=self.local) != 0:
raise VCSException("Git submodule update failed") raise VCSException("Git submodule update failed")
if subprocess.call(['git', 'submodule', 'foreach', if subprocess.call(['git', 'submodule', 'foreach',