Also reset --hard and clean -dffx the git submodules

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 9f99a1bb0414472e1f345f7cad015273e14e593a..52681b84ea253bf9b4fc6f49e5ae6e447a3daacd 100644 (file)
--- 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()