kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

replace redundant build_tools check that breaks fdroid init

Browse Source 
This reverts b637568a62 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.
This commit is contained in:
Hans-Christoph Steiner 2014-06-30 21:37:46 -04:00
parent 9dd138b253
commit 4d913d646a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdroidserver/common.py
View File

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

2
tests/run-tests
View File

@ -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`