From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 27 Mar 2014 17:38:12 +0000 (+0100)
Subject: Start rewriting git@github submodues to use https
X-Git-Tag: 0.2~163
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=25a8dd5af45825280e1359c343c96695c81f05d1;p=fdroidserver.git

Start rewriting git@github submodues to use https
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 0d0ccccd..6f234a56 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -345,6 +345,19 @@ class vcs_git(vcs):
 
     def initsubmodules(self):
         self.checkrepo()
+        submfile = os.path.join(self.local, '.gitmodules')
+        if not os.path.isfile(submfile):
+            raise VCSException("No git submodules available")
+
+        # fix submodules not accessible without an account and public key auth
+        with open(submfile, 'r') as f:
+            lines = f.readlines()
+        with open(submfile, 'w') as f:
+            for line in lines:
+                if 'git@github.com' in line:
+                    line = line.replace('git@github.com:', 'https://github.com/')
+                f.write(line)
+
         for cmd in [
                 ['git', 'reset', '--hard'],
                 ['git', 'clean', '-dffx'],