update: make icon extraction less dependent on aapt

[fdroidserver.git] / fdroidserver / init.py

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 9d03e0b9284b94dbed0d00bd7c9330e2dc758144..b47d65b6219fd4b6433828eaed8c4f012ff6fa15 100644 (file)
--- 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 = []
@@ -144,7 +146,7 @@ def main():
             if os.path.isfile(os.path.join(d, 'aapt')):
                 aapt = os.path.join(d, 'aapt')
                 break
-        if os.path.isfile(aapt):
+        if aapt and os.path.isfile(aapt):
             dirname = os.path.basename(os.path.dirname(aapt))
             if dirname == 'build-tools':
                 # this is the old layout, before versioned build-tools