From ab02a6fcc31e7ea01a4bae3d71c0566af20df8d6 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 25 Oct 2017 22:39:31 +0200 Subject: [PATCH] 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 --- fdroidserver/scanner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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):