From d1ded7f64d0e3e2b1734dabc3604a0d8ead75b07 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 14 Feb 2018 17:22:25 +0100
Subject: [PATCH] update: use androguard by default if it is available

closes #236
---
 fdroidserver/update.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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)))
-- 
2.30.2