opensourcemirror
/
fdroid-server
mirror of https://gitlab.com/fdroid/fdroidserver.git
1
0
Fork 0
Code Issues Releases Wiki Activity

init: fix init with Debian Android SDK packages 

If the auto-detected SDK path passes test_sdk_exists(), then just use
it without prompting.

fixes !821
This commit is contained in:
Hans-Christoph Steiner 2020-11-10 09:55:46 +01:00
parent 85fa53008c
commit 767573f2ec
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fdroidserver/init.py
View File

@ -94,22 +94,23 @@ def main():
p = '/opt/android-sdk'
if os.path.exists(p):
default_sdk_path = p
test_config['sdk_path'] = default_sdk_path
while not options.no_prompt:
try:
s = input(_('Enter the path to the Android SDK (%s) here:\n> ') % default_sdk_path)
except KeyboardInterrupt:
print('')
sys.exit(1)
if re.match(r'^\s*$', s) is not None:
test_config['sdk_path'] = default_sdk_path
else:
test_config['sdk_path'] = s
if not default_sdk_path:
del(test_config['sdk_path'])
break
if common.test_sdk_exists(test_config):
break
if not common.test_sdk_exists(test_config):
del(test_config['sdk_path'])
while not options.no_prompt:
try:
s = input(_('Enter the path to the Android SDK (%s) here:\n> ') % default_sdk_path)
except KeyboardInterrupt:
print('')
sys.exit(1)
if re.match(r'^\s*$', s) is not None:
test_config['sdk_path'] = default_sdk_path
else:
test_config['sdk_path'] = s
if common.test_sdk_exists(test_config):
break
default_sdk_path = ''
if test_config.get('sdk_path') and not common.test_sdk_exists(test_config):
raise FDroidException(_("Android SDK not found at {path}!")