From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 22 Feb 2018 11:10:53 +0000 (+0100)
Subject: init: do not try to find aapt if androguard is available
X-Git-Tag: 1.0.1~2^2~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=847bbb6e43805513e6df77241b6c00fb2715f222;hp=aa4f54bf187e2ca45838e82fc50d9a92e4f08ce2;p=fdroidserver.git

init: do not try to find aapt if androguard is available
---

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 7b59bdb7..b47d65b6 100644
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -131,7 +131,9 @@ def main():
         logging.info('Try running `fdroid init` in an empty directory.')
         raise FDroidException('Repository already exists.')
 
-    if 'aapt' not in test_config or not os.path.isfile(test_config['aapt']):
+    if common.use_androguard():
+        pass
+    elif 'aapt' not in test_config or not os.path.isfile(test_config['aapt']):
         # try to find a working aapt, in all the recent possible paths
         build_tools = os.path.join(test_config['sdk_path'], 'build-tools')
         aaptdirs = []