chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa4f54b
)
init: do not try to find aapt if androguard is available
author
Hans-Christoph Steiner
<hans@eds.org>
Thu, 22 Feb 2018 11:10:53 +0000
(12:10 +0100)
committer
Hans-Christoph Steiner
<hans@eds.org>
Thu, 22 Feb 2018 12:38:02 +0000
(13:38 +0100)
fdroidserver/init.py
patch
|
blob
|
history
diff --git
a/fdroidserver/init.py
b/fdroidserver/init.py
index 7b59bdb7672840e60bb2e25ae343eef64ab14366..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 = []