From 5167e3d77110d3e2f33d1deda8a2a1c226e0f005 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Tue, 22 Jul 2014 10:06:38 +0200 Subject: [PATCH] Don't crash if a magic number can't be used This should fix the anki build crashing. --- fdroidserver/common.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 960d06ca..18148018 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1460,7 +1460,10 @@ def scan_source(build_dir, root_dir, thisbuild): if toignore(fd): continue - mime = magic.from_file(fp, mime=True) if ms is None else ms.file(fp) + try: + mime = magic.from_file(fp, mime=True) if ms is None else ms.file(fp) + except UnicodeError: + warnproblem('malformed magic number', fd, fp) if mime == 'application/x-sharedlib': count += handleproblem('shared library', fd, fp) -- 2.30.2