From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 25 Oct 2017 20:39:31 +0000 (+0200)
Subject: Revert "scanner: promote jar and aar files present in the repo to errors"
X-Git-Tag: 0.9~46
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ab02a6fcc31e7ea01a4bae3d71c0566af20df8d6;p=fdroidserver.git

Revert "scanner: promote jar and aar files present in the repo to errors"

This reverts commit 5f5d3ea896183260258f653f971c01896ec20ddf.

These new scanner rules for JARs causes most builds on fdroiddata to
break.  For example, at least the past 20 releases of
org.fdroid.fdroid.  fdroiddata needs to be cleaned up and prepared for
this before we can include 5f5d3ea896183260258f653f971c01896ec20ddf

I'm running fdroid scanner on the whole archive now, I'll post the log
to an issue once its done.  Ignoring test files would eliminate some
of these build failures, at least for most org.fdroid.fdroid builds.

refs #!325
---

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 0b622bcd..030ac7c4 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -202,10 +202,10 @@ def scan_source(build_dir, build):
                 if curfile == 'gradle-wrapper.jar':
                     removeproblem('gradle-wrapper.jar', path_in_build_dir, filepath)
                 else:
-                    count += handleproblem('JAR file', path_in_build_dir, filepath)
+                    warnproblem('JAR file', path_in_build_dir)
 
             elif ext == 'aar':
-                count += handleproblem('AAR file', path_in_build_dir, filepath)
+                warnproblem('AAR file', path_in_build_dir)
 
             elif ext == 'java':
                 if not os.path.isfile(filepath):