From 1a77c6af3863c76192e1b472183a8c6ae9679f71 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 6 Dec 2017 13:41:03 +0100 Subject: [PATCH] init: fix test for aapt when no aapt has been found Just give a proper error message rather than this stack trace: Traceback (most recent call last): File "/home/hans/code/fdroid/server/fdroid", line 156, in main() File "/home/hans/code/fdroid/server/fdroid", line 132, in main mod.main() File "/export/share/code/fdroid/server/fdroidserver/init.py", line 148, in main if os.path.isfile(aapt): File "/usr/lib/python3.5/genericpath.py", line 30, in isfile st = os.stat(path) --- fdroidserver/init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/init.py b/fdroidserver/init.py index 9d03e0b9..7b59bdb7 100644 --- a/fdroidserver/init.py +++ b/fdroidserver/init.py @@ -144,7 +144,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 -- 2.30.2