kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 19:10:11 +01:00
Code Activity

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

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-02-22 12:10:53 +01:00
parent aa4f54bf18
commit 847bbb6e43
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/init.py
View File

@ -131,7 +131,9 @@ def main():
logging.info('Try running `fdroid init` in an empty directory.') logging.info('Try running `fdroid init` in an empty directory.')
raise FDroidException('Repository already exists.') 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 # try to find a working aapt, in all the recent possible paths
build_tools = os.path.join(test_config['sdk_path'], 'build-tools') build_tools = os.path.join(test_config['sdk_path'], 'build-tools')
aaptdirs = [] aaptdirs = []