From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 14 Feb 2018 16:22:25 +0000 (+0100)
Subject: update: use androguard by default if it is available
X-Git-Tag: 1.0.1~4^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d1ded7f64d0e3e2b1734dabc3604a0d8ead75b07;p=fdroidserver.git

update: use androguard by default if it is available

closes #236
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 16a7c3ba..fc945670 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1049,10 +1049,12 @@ def scan_apk(apk_file):
         'antiFeatures': set(),
     }
 
-    if SdkToolsPopen(['aapt', 'version'], output=False):
-        scan_apk_aapt(apk, apk_file)
-    else:
+    try:
+        import androguard
+        androguard  # silence pyflakes
         scan_apk_androguard(apk, apk_file)
+    except ImportError:
+        scan_apk_aapt(apk, apk_file)
 
     # Get the signature, or rather the signing key fingerprints
     logging.debug('Getting signature of {0}'.format(os.path.basename(apk_file)))