chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
779476e
)
Import magic only at build time
author
Daniel Martí
<mvdan@mvdan.cc>
Wed, 16 Oct 2013 07:31:26 +0000
(09:31 +0200)
committer
Daniel Martí
<mvdan@mvdan.cc>
Wed, 16 Oct 2013 07:31:26 +0000
(09:31 +0200)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 71918f27e120f0471848582cd1bcdf1f683aabdd..0a598282ba0b7ae89f580613f44a740c29771642 100644
(file)
--- 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: