Run git submodule sync before git submodule update

Fixes changes in submodule urls
This commit is contained in:
Daniel Martí 2014-04-29 12:00:03 +02:00
parent 965c767d8b
commit 13af519069

View file

@ -428,6 +428,9 @@ class vcs_git(vcs):
p = SilentPopen(['git', 'submodule', 'foreach', '--recursive'] + cmd, cwd=self.local) p = SilentPopen(['git', 'submodule', 'foreach', '--recursive'] + cmd, cwd=self.local)
if p.returncode != 0: if p.returncode != 0:
raise VCSException("Git submodule reset failed") raise VCSException("Git submodule reset failed")
p = FDroidPopen(['git', 'submodule', 'sync'], cwd=self.local)
if p.returncode != 0:
raise VCSException("Git submodule sync failed")
p = FDroidPopen(['git', 'submodule', 'update', '--init', '--force', '--recursive'], cwd=self.local) p = FDroidPopen(['git', 'submodule', 'update', '--init', '--force', '--recursive'], cwd=self.local)
if p.returncode != 0: if p.returncode != 0:
raise VCSException("Git submodule update failed") raise VCSException("Git submodule update failed")