From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 1 Jun 2014 14:37:33 +0000 (+0200)
Subject: Add support for gitlab.com repos to import
X-Git-Tag: 0.2~49
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8675d50261d5dc08b26825f348c2d1c22edc33f1;p=fdroidserver.git

Add support for gitlab.com repos to import
---

diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index b17bb4df..27b0c90b 100644
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -138,13 +138,12 @@ def main():
         sourcecode = ""
         website = ""
     elif url.startswith('https://github.com'):
-        if url.endswith('/'):
-            url = url[:-1]
-        if url.endswith('.git'):
-            logging.info("A github URL should point to the project, not the git repo")
-            sys.exit(1)
         projecttype = 'github'
-        repo = url + '.git'
+        repotype = 'git'
+        sourcecode = url
+        issuetracker = url + '/issues'
+    elif url.startswith('https://gitlab.com/'):
+        projecttype = 'gitlab'
         repotype = 'git'
         sourcecode = url
         issuetracker = url + '/issues'