mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-05 23:10:29 +03:00
Merge branch 'master' into logging
Conflicts: fdroidserver/build.py
This commit is contained in:
commit
72fa1891bf
6 changed files with 41 additions and 25 deletions
|
|
@ -333,20 +333,18 @@ class vcs_git(vcs):
|
|||
|
||||
def initsubmodules(self):
|
||||
self.checkrepo()
|
||||
if subprocess.call(['git', 'submodule', 'init'],
|
||||
cwd=self.local) != 0:
|
||||
raise VCSException("Git submodule init failed")
|
||||
if subprocess.call(['git', 'submodule', 'update'],
|
||||
cwd=self.local) != 0:
|
||||
raise VCSException("Git submodule update failed")
|
||||
if subprocess.call(['git', 'submodule', 'foreach',
|
||||
if subprocess.call(['git', 'submodule', 'foreach', '--recursive',
|
||||
'git', 'reset', '--hard'],
|
||||
cwd=self.local) != 0:
|
||||
raise VCSException("Git submodule reset failed")
|
||||
if subprocess.call(['git', 'submodule', 'foreach',
|
||||
if subprocess.call(['git', 'submodule', 'foreach', '--recursive',
|
||||
'git', 'clean', '-dffx'],
|
||||
cwd=self.local) != 0:
|
||||
raise VCSException("Git submodule clean failed")
|
||||
if subprocess.call(['git', 'submodule', 'update',
|
||||
'--init', '--force', '--recursive'],
|
||||
cwd=self.local) != 0:
|
||||
raise VCSException("Git submodule update failed")
|
||||
|
||||
def gettags(self):
|
||||
self.checkrepo()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue