From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 16 Mar 2014 22:38:00 +0000 (+0100)
Subject: Properly identify jar files
X-Git-Tag: 0.2~188
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9014206b76d02a3887cdbe4a943aa155141988eb;p=fdroidserver.git

Properly identify jar files
---

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)