From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 16 Oct 2013 07:31:26 +0000 (+0200)
Subject: Import magic only at build time
X-Git-Tag: 0.1~352
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0154a7785441afafbadf4ac42704390110a55bf6;p=fdroidserver.git

Import magic only at build time
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 71918f27..0a598282 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -23,7 +23,6 @@ import subprocess
 import time
 import operator
 import cgi
-import magic
 
 def getvcs(vcstype, remote, local, sdk_path):
     if vcstype == 'git':
@@ -1591,6 +1590,7 @@ def scan_source(build_dir, root_dir, thisbuild):
         ignore = []
 
     # Iterate through all files in the source code...
+    import magic
     with magic.Magic(flags=magic.MAGIC_MIME_TYPE) as m:
         for r,d,f in os.walk(build_dir):
             for curfile in f: