From d0a10e05d9c2cb5a4b6e30630a0a7d1db3befd78 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 7 Jun 2015 14:05:29 +0200
Subject: [PATCH] lint: get rid of -p/--pedantic

Only one check was left, and it's of little use anyway.
---
 completion/bash-completion |  4 ++--
 fdroidserver/lint.py       | 14 +-------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/completion/bash-completion b/completion/bash-completion
index 0ace8946..ca517c20 100644
--- a/completion/bash-completion
+++ b/completion/bash-completion
@@ -197,8 +197,8 @@ __complete_rewritemeta() {
 }
 
 __complete_lint() {
-	opts="-v -q -p"
-	lopts="--verbose --quiet --pedantic"
+	opts="-v -q"
+	lopts="--verbose --quiet"
 	case "${cur}" in
 		-*)
 			__complete_options
diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 89c5c9a9..4a7134ff 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -106,18 +106,12 @@ def main():
         print '    %s' % message
         count['warn'] += 1
 
-    def pwarn(message):
-        if options.pedantic:
-            warn(message)
-
     # Parse command line...
     parser = OptionParser(usage="Usage: %prog [options] [APPID [APPID ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
     parser.add_option("-q", "--quiet", action="store_true", default=False,
                       help="Restrict output to warnings and errors")
-    parser.add_option("-p", "--pedantic", action="store_true", default=False,
-                      help="Show pedantic warnings that might give false positives")
     (options, args) = parser.parse_args()
 
     config = common.read_config(options)
@@ -138,7 +132,7 @@ def main():
             if not curbuild or int(build['vercode']) > int(curbuild['vercode']):
                 curbuild = build
 
-        # Potentially incorrect UCM
+        # Incorrect UCM
         if (curbuild and curbuild['commit']
                 and app['Update Check Mode'] == 'RepoManifest'
                 and not curbuild['commit'].startswith('unknown')
@@ -147,12 +141,6 @@ def main():
             warn("Last used commit '%s' looks like a tag, but Update Check Mode is '%s'" % (
                 curbuild['commit'], app['Update Check Mode']))
 
-        # Dangerous auto updates
-        if curbuild and app['Auto Update Mode'] != 'None':
-            for flag in ['target', 'srclibs', 'scanignore']:
-                if curbuild[flag]:
-                    pwarn("Auto Update Mode is enabled but '%s' is manually set at '%s'" % (flag, curbuild[flag]))
-
         # Summary size limit
         summ_chars = len(app['Summary'])
         if summ_chars > config['char_limits']['Summary']:
-- 
2.30.2