mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-11 15:13:27 +02:00
Do not output warnings for missing configs
This commit is contained in:
parent
ae0ca52557
commit
86c91c8166
@ -83,7 +83,6 @@ def read_config(opts, config_file='config.py'):
|
|||||||
# Check that commands and binaries do exist
|
# Check that commands and binaries do exist
|
||||||
for key in ('mvn3', 'gradle'):
|
for key in ('mvn3', 'gradle'):
|
||||||
if key not in config:
|
if key not in config:
|
||||||
print "WARNING: %s not set in config" % key
|
|
||||||
continue
|
continue
|
||||||
val = config[key]
|
val = config[key]
|
||||||
executable = find_executable(val)
|
executable = find_executable(val)
|
||||||
@ -94,10 +93,12 @@ def read_config(opts, config_file='config.py'):
|
|||||||
# Check that directories exist
|
# Check that directories exist
|
||||||
for key in ('sdk_path', 'ndk_path', 'build_tools'):
|
for key in ('sdk_path', 'ndk_path', 'build_tools'):
|
||||||
if key not in config:
|
if key not in config:
|
||||||
print "WARNING: %s not set in config" % key
|
|
||||||
continue
|
continue
|
||||||
val = config[key]
|
val = config[key]
|
||||||
if key == 'build_tools':
|
if key == 'build_tools':
|
||||||
|
if 'sdk_path' not in config:
|
||||||
|
print "ERROR: sdk_path needs to be set for build_tools"
|
||||||
|
sys.exit(3)
|
||||||
val = os.path.join(config['sdk_path'], 'build-tools', val)
|
val = os.path.join(config['sdk_path'], 'build-tools', val)
|
||||||
if not os.path.isdir(val):
|
if not os.path.isdir(val):
|
||||||
print "ERROR: No such directory found for %s: %s" % (key, val)
|
print "ERROR: No such directory found for %s: %s" % (key, val)
|
||||||
|
Loading…
Reference in New Issue
Block a user