From 8306bac7deb98ad0e29c013cb947721b07f6b6af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 3 Jul 2014 18:23:35 +0200 Subject: [PATCH] Also check that platform-tools and tools exist --- fdroidserver/common.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index f36b4768..34ad2efc 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -186,9 +186,11 @@ def test_sdk_exists(c): if not os.path.isdir(c['sdk_path']): logging.critical('Android SDK path "' + c['sdk_path'] + '" is not a directory!') return False - if not os.path.isdir(os.path.join(c['sdk_path'], 'build-tools')): - logging.critical('Android SDK path "' + c['sdk_path'] + '" does not contain "build-tools/"!') - return False + for d in ['build-tools', 'platform-tools', 'tools']: + if not os.path.isdir(os.path.join(c['sdk_path'], d)): + logging.critical('Android SDK path "%s" does not contain "%s/"!' % ( + c['sdk_path'], d)) + return False return True -- 2.30.2