From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 1 Jul 2014 01:37:46 +0000 (-0400)
Subject: replace redundant build_tools check that breaks `fdroid init`
X-Git-Tag: 0.2.1~73^2~2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4d913d646a7d5d0511c23fb1dfd5560263452558;p=fdroidserver.git

replace redundant build_tools check that breaks `fdroid init`

This reverts b637568a624cc75f4e67a0df59a017872e2129c6 since it added a
redundant check that broke `fdroid init` when the default version dir of
build_tools does not exist on the local system.  It then uses the function
that was already in place for checking the build_tools setup in a way that
does not break `fdroid init`.

Now that the fake android home version is not matching the default version,
the tests will catch this bug in the future.
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index c5f2aa1f..54c9736a 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -121,6 +121,9 @@ def read_config(opts, config_file='config.py'):
     if not test_sdk_exists(config):
         sys.exit(3)
 
+    if not test_build_tools_exists(config):
+        sys.exit(3)
+
     for k in ["keystorepass", "keypass"]:
         if k in config:
             write_password_file(k)
@@ -151,9 +154,6 @@ 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
 
 
diff --git a/tests/run-tests b/tests/run-tests
index 214233c2..f1f23c90 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -179,7 +179,7 @@ set -e
 
 
 #------------------------------------------------------------------------------#
-echo_header "check that fake android home passes `fdroid init`"
+echo_header "check that fake android home passes 'fdroid init'"
 
 REPOROOT=`create_test_dir`
 FAKE_ANDROID_HOME=`create_test_dir`