From 13af51906916b8f9db838017caa0867171fad046 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Tue, 29 Apr 2014 12:00:03 +0200 Subject: [PATCH] Run git submodule sync before git submodule update Fixes changes in submodule urls --- fdroidserver/common.py | 3 +++ 1 file changed, 3 insertions(+) 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") -- 2.30.2