From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 22 Feb 2018 12:39:41 +0000 (+0100)
Subject: update: switch to improved androguard detection
X-Git-Tag: 1.0.1~2^2~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=88e24dc4e305e1e7476dfb23001bc40387f0de10;p=fdroidserver.git

update: switch to improved androguard detection
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 5b39e751..4d227dd4 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1049,11 +1049,9 @@ def scan_apk(apk_file):
         'antiFeatures': set(),
     }
 
-    try:
-        import androguard
-        androguard  # silence pyflakes
+    if common.use_androguard():
         scan_apk_androguard(apk, apk_file)
-    except ImportError:
+    else:
         scan_apk_aapt(apk, apk_file)
 
     # Get the signature, or rather the signing key fingerprints