From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 29 Apr 2014 10:00:03 +0000 (+0200)
Subject: Run git submodule sync before git submodule update
X-Git-Tag: 0.2~102
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=13af51906916b8f9db838017caa0867171fad046;p=fdroidserver.git

Run git submodule sync before git submodule update

Fixes changes in submodule urls
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index dc6ac697..e30d188c 100644
--- 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")