From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 30 May 2014 16:48:35 +0000 (+0200)
Subject: Make unspecified license use regex
X-Git-Tag: 0.2~57
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5933880a9002ef2bd11a1f82af7ae9e0e57f1654;p=fdroidserver.git

Make unspecified license use regex
---

diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 65dc52d9..5499d6e7 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -73,6 +73,10 @@ regex_warnings = {
         (re.compile(r'.*[^sS]://gitorious\.org/.*'),
          "gitorious URLs should always use https:// not http://"),
         ],
+    'License': [
+        (re.compile(r'^(|None|Unknown)$'),
+         "No license specified"),
+        ],
     'Description': [
         (re.compile(r'^No description available$'),
          "Description yet to be filled"),
@@ -98,9 +102,9 @@ regex_pedantic = {
         ],
     'Repo': [
         (re.compile(r'^http://.*'),
-         "if https:// is available, use it instead of http://"),
+         "use https:// if available"),
         (re.compile(r'^svn://.*'),
-         "if https:// is available, use it instead of svn://"),
+         "use https:// if available"),
         ],
     'Issue Tracker': [
         (re.compile(r'.*code\.google\.com/p/[^/]+/issues/.*'),
@@ -175,10 +179,6 @@ def main():
             pwarn("Last used commit '%s' looks like a tag, but Update Check Mode is '%s'" % (
                 lastcommit, app['Update Check Mode']))
 
-        # No proper license
-        if app['License'] in ('Unknown', 'None', ''):
-            warn("License was not set")
-
         # Summary size limit
         summ_chars = len(app['Summary'])
         if summ_chars > config['char_limits']['Summary']: