mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: only test for all Android SDK paths where it is needed

Browse source 
Now that androguard can be used, the android-sdk is no longer required for
most operations.
This commit is contained in:
Hans-Christoph Steiner 2018-06-22 23:26:15 +02:00
parent 669401640a
commit d20e8613fe
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/build.py
View file

@ -1000,6 +1000,12 @@ def main():
if options.reset_server and not options.server: if options.reset_server and not options.server:
parser.error("option %s: Using --reset-server without --server makes no sense" % "reset-server") parser.error("option %s: Using --reset-server without --server makes no sense" % "reset-server")
if options.onserver or not options.server:
for d in ['build-tools', 'platform-tools', 'tools']:
if not os.path.isdir(os.path.join(config['sdk_path'], d)):
raise FDroidException(_("Android SDK '{path}' does not have '{dirname}' installed!")
.format(path=config['sdk_path'], dirname=d))
log_dir = 'logs' log_dir = 'logs'
if not os.path.isdir(log_dir): if not os.path.isdir(log_dir):
logging.info("Creating log directory") logging.info("Creating log directory")

5
fdroidserver/common.py
View file

@ -437,11 +437,6 @@ def test_sdk_exists(thisconfig):
logging.critical(_("Android SDK path '{path}' is not a directory!") logging.critical(_("Android SDK path '{path}' is not a directory!")
.format(path=thisconfig['sdk_path'])) .format(path=thisconfig['sdk_path']))
return False return False
for d in ['build-tools', 'platform-tools', 'tools']:
if not os.path.isdir(os.path.join(thisconfig['sdk_path'], d)):
logging.critical(_("Android SDK '{path}' does not have '{dirname}' installed!")
.format(path=thisconfig['sdk_path'], dirname=d))
return False
return True return True