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 c5f2aa1f0d8fa554e0cc255e832ece3e02fb5ddc..54c9736ae6299dcb69ba1838f3e52130a7de3658 100644 (file)
--- 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 214233c2136408fecfa20e9088b5852f5637f2ba..f1f23c903dc21a045d521734ea8af13df761538c 100755 (executable)
--- 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`