Run git submodule sync before git submodule update

Fixes changes in submodule urls

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index dc6ac6974a18333259ef6833229a0d8908021f58..e30d188c5b615e4bfa2d4dcd8e61c0f60fc92af7 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -428,6 +428,9 @@ class vcs_git(vcs):
             p = SilentPopen(['git', 'submodule', 'foreach', '--recursive'] + cmd, cwd=self.local)
             if p.returncode != 0:
                 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)
         if p.returncode != 0:
             raise VCSException("Git submodule update failed")