Fix multiple errors in get_mime_type

Closes #111

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 7b2aa0875156074e4fec3cd9477e77324787f9de..e775e846bea05bef1a4e4b24d53c37517c2fa6b7 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1452,23 +1452,25 @@ def get_mime_type(path):
     libmagic. Hence this function with the following hacks:
     '''
 
+    ms = None
     try:
         import magic
-        ms = None
         try:
             ms = magic.open(magic.MIME_TYPE)
             ms.load()
-            return magic.from_file(path, mime=True)
+            result = magic.from_file(path, mime=True)
         except AttributeError:
-            return ms.file(path)
-        if ms is not None:
-            ms.close()
+            result = ms.file(path)
     except UnicodeError:
         logging.warn('Found malformed magic number at %s' % path)
+        result = None
     except ImportError:
         import mimetypes
         mimetypes.init()
-        return mimetypes.guess_type(path, strict=False)
+        result = mimetypes.guess_type(path, strict=False)
+    if ms is not None:
+        ms.close()
+    return result
 
 
 # Scan the source code in the given directory (and all subdirectories)