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

Merge branch 'master' into 'master'

Browse source 
Fix keytool not found on MacOSX (when using Java from Apple)

See merge request fdroid/fdroidserver!557
This commit is contained in:
Michael Pöhn 2018-08-20 10:57:45 +00:00
commit c766129f8b
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fdroidserver/common.py
View file

@ -236,6 +236,10 @@ 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:
thisconfig['jarsigner'] = shutil.which('jarsigner')
thisconfig['keytool'] = shutil.which('keytool')
for k in ['ndk_paths', 'java_paths']: for k in ['ndk_paths', 'java_paths']:
d = thisconfig[k] d = thisconfig[k]
for k2 in d.copy(): for k2 in d.copy():
@ -2907,7 +2911,8 @@ def genkeystore(localconfig):
'-validity', '10000', '-validity', '10000',
'-storepass:env', 'FDROID_KEY_STORE_PASS', '-storepass:env', 'FDROID_KEY_STORE_PASS',
'-keypass:env', 'FDROID_KEY_PASS', '-keypass:env', 'FDROID_KEY_PASS',
'-dname', localconfig['keydname']], envs=env_vars) '-dname', localconfig['keydname'],
'-J-Duser.language=en'], envs=env_vars)
if p.returncode != 0: if p.returncode != 0:
raise BuildException("Failed to generate key", p.output) raise BuildException("Failed to generate key", p.output)
os.chmod(localconfig['keystore'], 0o0600) os.chmod(localconfig['keystore'], 0o0600)
@ -2916,7 +2921,7 @@ def genkeystore(localconfig):
p = FDroidPopen([config['keytool'], '-list', '-v', p = FDroidPopen([config['keytool'], '-list', '-v',
'-keystore', localconfig['keystore'], '-keystore', localconfig['keystore'],
'-alias', localconfig['repo_keyalias'], '-alias', localconfig['repo_keyalias'],
'-storepass:env', 'FDROID_KEY_STORE_PASS'], envs=env_vars) '-storepass:env', 'FDROID_KEY_STORE_PASS', '-J-Duser.language=en'], envs=env_vars)
logging.info(p.output.strip() + '\n\n') logging.info(p.output.strip() + '\n\n')
# get the public key # get the public key
p = FDroidPopenBytes([config['keytool'], '-exportcert', p = FDroidPopenBytes([config['keytool'], '-exportcert',