From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 22 Jul 2014 08:06:38 +0000 (+0200)
Subject: Don't crash if a magic number can't be used
X-Git-Tag: 0.2.1~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5167e3d77110d3e2f33d1deda8a2a1c226e0f005;p=fdroidserver.git

Don't crash if a magic number can't be used

This should fix the anki build crashing.
---

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)