mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 16:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch to python-magic from PIL

Browse source
This commit is contained in:
Daniel Martí 2014-02-03 14:14:42 +01:00
parent 7bf74d47bb
commit 8541cdf893
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/common.py
View file

@ -1186,9 +1186,6 @@ def scan_source(build_dir, root_dir, thisbuild):
scanignore = getpaths('scanignore')
scandelete = getpaths('scandelete')
ms = magic.open(magic.MIME_TYPE)
ms.load()
def toignore(fd):
for i in scanignore:
if fd.startswith(i):
@ -1237,7 +1234,7 @@ def scan_source(build_dir, root_dir, thisbuild):
if suspect in curfile.lower():
handleproblem('usual supect', fd, fp)
mime = ms.file(fp)
mime = magic.from_file(fp, mime=True)
if mime == 'application/x-sharedlib':
handleproblem('shared library', fd, fp)
elif mime == 'application/x-archive':
@ -1254,7 +1251,6 @@ def scan_source(build_dir, root_dir, thisbuild):
if 'DexClassLoader' in line:
handleproblem('DexClassLoader', fd, fp)
break
ms.close()
# Presence of a jni directory without buildjni=yes might
# indicate a problem (if it's not a problem, explicitly use