Merge branch 'error_on_jars' into 'master'

[fdroidserver.git] / fdroidserver / scanner.py

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 446091dc38b857e371d42d08be3ba7b2f8d66f53..0b622bcdbc208fd0b87585112fc11a6e58804469 100644 (file)
--- 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):