From bd59b2f77dc6a42a63a6f55f01f4188aa71ec944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 16 Oct 2013 11:55:17 +0200 Subject: [PATCH] Don't catch octet-stream, catch static libs and bin exes --- fdroidserver/common.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 00919cc4..022b0a27 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1617,11 +1617,13 @@ def scan_source(build_dir, root_dir, thisbuild): mime = m.id_filename(fp) if mime == 'application/x-sharedlib': - problems.append('Found shared library at %s (%s)' % (fd, fp)) - elif mime == 'application/octet-stream': - problems.append('Found binary at %s (%s)' % (fd, fp)) - elif mime == 'application/vnd.android.package-archive' or fp.endswith('.apk'): - problems.append('Found apk at %s (%s)' % (fd, fp)) + problems.append('Found shared library at %s' % fd) + elif mime == 'application/x-archive': + problems.append('Found static library at %s' % fd) + elif mime == 'application/x-executable': + problems.append('Found binary executable at %s' % fd) + elif fp.endswith('.apk'): + problems.append('Found apk archive at %s' % fd) elif curfile.endswith('.java'): for line in file(fp):