1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-04 16:30:12 +02:00

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.
This commit is contained in:
Jochen Sprickerhof 2020-12-06 10:28:42 +01:00
parent 5df13bcb8c
commit 66d0e6b1f9

View File

@ -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):