From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 3 Jun 2015 20:17:35 +0000 (+0200)
Subject: Re-add https enforcings to Repo:
X-Git-Tag: 0.4.0~50
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9061f71dc4a66e4a5ad36aefb76ed6063d748d7f;p=fdroidserver.git

Re-add https enforcings to Repo:
---

diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index d1d0c522..bd587cbe 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -32,15 +32,18 @@ def enforce_https(domain):
     return (re.compile(r'.*[^sS]://[^/]*' + re.escape(domain) + r'/.*'),
             domain + " URLs should always use https://")
 
-http_warnings = [
-    (re.compile(r'.*/$'),
-     "HTTP links shouldn't end with a slash"),
+https_enforcings = [
     enforce_https('github.com'),
     enforce_https('gitorious.org'),
     enforce_https('apache.org'),
     enforce_https('google.com'),
     enforce_https('svn.code.sf.net'),
     enforce_https('googlecode.com'),
+]
+
+http_warnings = https_enforcings + [
+    (re.compile(r'.*/$'),
+     "HTTP links shouldn't end with a slash"),
     # TODO enable in August 2015, when Google Code goes read-only
     # (re.compile(r'.*://code\.google\.com/.*'),
     #  "code.google.com will be soon switching down, perhaps the project moved to github.com?"),
@@ -51,7 +54,7 @@ regex_warnings = {
     ],
     'Source Code': http_warnings + [
     ],
-    'Repo': [
+    'Repo': https_enforcings + [
     ],
     'Issue Tracker': http_warnings + [
         (re.compile(r'.*github\.com/[^/]+/[^/]+[/]*$'),
@@ -96,10 +99,6 @@ regex_pedantic = {
          "Appending .git is not necessary"),
     ],
     'Repo': [
-        (re.compile(r'^http://.*'),
-         "use https:// if available"),
-        (re.compile(r'^svn://.*'),
-         "use https:// if available"),
     ],
     'Issue Tracker': [
         (re.compile(r'.*github\.com/[^/]+/[^/]+/issues/.*'),