From 66d0e6b1f9739f96ee3dce6f7a9113a7e8af4ef2 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sun, 6 Dec 2020 10:28:42 +0100 Subject: [PATCH] find_sdk_tools_cmd always raise exception if not found test_sdk_exists() succeeds on an empty directory so it does not give any new information. Contrary, test_sdk_exists() succeeds on an empty directory, so find_sdk_tools_cmd() returned None even though the tools where not found, before. --- fdroidserver/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 63a52b30..c75338f1 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -520,8 +520,8 @@ def find_sdk_tools_cmd(cmd): test_aapt_version(path) return path # did not find the command, exit with error message - if not test_sdk_exists(config): - raise FDroidException(_("Android SDK not found!")) + test_sdk_exists(config) # ignore result so None is never returned + raise FDroidException(_("Android SDK tool {cmd} found!").format(cmd=cmd)) def test_aapt_version(aapt):