From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 18 Feb 2014 15:16:46 +0000 (+0100)
Subject: Some JARs have zip mimetype
X-Git-Tag: 0.2~253
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a1d85e32f173292e0756f1dbc5402194057a624b;p=fdroidserver.git

Some JARs have zip mimetype
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 388a65f5..6d7dca14 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1211,7 +1211,8 @@ 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':
+            elif mime == 'application/jar' or (
+                    mime == 'application/zip' and has_extension(fp, 'jar')):
                 warnproblem('JAR file', fd, fp)
             elif mime == 'application/zip':
                 warnproblem('ZIP file', fd, fp)