From 9014206b76d02a3887cdbe4a943aa155141988eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Sun, 16 Mar 2014 23:38:00 +0100 Subject: [PATCH] Properly identify jar files --- fdroidserver/common.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 9d698773..2cf1904e 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1221,8 +1221,11 @@ def scan_source(build_dir, root_dir, thisbuild): handleproblem('Java compiled class', fd, fp) elif mime == 'application/jar' and has_extension(fp, 'apk'): removeproblem('APK file', fd, fp) - elif mime == 'application/jar' or ( - mime == 'application/zip' and has_extension(fp, 'jar')): + elif has_extension(fp, 'jar') and mime in [ + 'application/zip', + 'application/java-archive', + 'binary', + ]: warnproblem('JAR file', fd, fp) elif mime == 'application/zip': warnproblem('ZIP file', fd, fp) -- 2.30.2