mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'jarsigner-and-keytool-lookup-regression' into 'master'

Browse source 
fix: jarsigner and keytool lookup regression

Closes #550

See merge request fdroid/fdroidserver!562
This commit is contained in:
Michael Pöhn 2018-08-21 01:28:22 +00:00
commit 1a8c77e815
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fdroidserver/common.py
View file

@ -236,8 +236,9 @@ def fill_config_defaults(thisconfig):
thisconfig['keytool'] = os.path.join(java_home, 'bin', 'keytool') thisconfig['keytool'] = os.path.join(java_home, 'bin', 'keytool')
break break
if 'jarsigner' not in thisconfig: if 'jarsigner' not in thisconfig and shutil.which('jarsigner'):
thisconfig['jarsigner'] = shutil.which('jarsigner') thisconfig['jarsigner'] = shutil.which('jarsigner')
if 'keytool' not in thisconfig and shutil.which('keytool'):
thisconfig['keytool'] = shutil.which('keytool') thisconfig['keytool'] = shutil.which('keytool')
for k in ['ndk_paths', 'java_paths']: for k in ['ndk_paths', 'java_paths']: