From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 16 Jun 2014 10:40:04 +0000 (+0200)
Subject: Warn if build_tools is not set up properly
X-Git-Tag: 0.2~26
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b637568a624cc75f4e67a0df59a017872e2129c6;p=fdroidserver.git

Warn if build_tools is not set up properly
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 303b3b6b..5b392149 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -142,6 +142,9 @@ def test_sdk_exists(c):
     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
+    if not os.path.isdir(os.path.join(c['sdk_path'], 'build-tools', c['build_tools'])):
+        logging.critical('Configured build-tools version "' + c['build_tools'] + '" not found in the SDK!')
+        return False
     return True