From 0c8283bc1aab225573a4a01e101b95b68362d885 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Fri, 1 Nov 2013 13:19:29 +0100 Subject: [PATCH] Also reset --hard and clean -dffx the git submodules --- fdroidserver/common.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 9f99a1bb..52681b84 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -211,6 +211,14 @@ class vcs_git(vcs): if subprocess.call(['git', 'submodule', 'update'], cwd=self.local) != 0: raise VCSException("Git submodule update failed") + if subprocess.call(['git', 'submodule', 'foreach', + 'git', 'reset', '--hard'], + cwd=self.local) != 0: + raise VCSException("Git submodule reset failed") + if subprocess.call(['git', 'submodule', 'foreach', + 'git', 'clean', '-dffx'], + cwd=self.local) != 0: + raise VCSException("Git submodule clean failed") def gettags(self): self.checkrepo() -- 2.30.2