From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Thu, 12 Oct 2017 11:46:59 +0000 (+0000)
Subject: Merge branch 'error_on_jars' into 'master'
X-Git-Tag: 0.9~57
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=53ce81179c2edbad306e3a0a6f7569430555e168;hp=d95e009c3f8ddfe9579084c92ba315ebb67ae6e7;p=fdroidserver.git

Merge branch 'error_on_jars' into 'master'

RFC: Error on jars

See merge request fdroid/fdroidserver!325
---

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 446091dc..0b622bcd 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -199,10 +199,13 @@ def scan_source(build_dir, build):
             elif ext == 'jar':
                 for name in suspects_found(curfile):
                     count += handleproblem('usual supect \'%s\'' % name, path_in_build_dir, filepath)
-                warnproblem('JAR file', path_in_build_dir)
+                if curfile == 'gradle-wrapper.jar':
+                    removeproblem('gradle-wrapper.jar', path_in_build_dir, filepath)
+                else:
+                    count += handleproblem('JAR file', path_in_build_dir, filepath)
 
             elif ext == 'aar':
-                warnproblem('AAR file', path_in_build_dir)
+                count += handleproblem('AAR file', path_in_build_dir, filepath)
 
             elif ext == 'java':
                 if not os.path.isfile(filepath):