kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 21:30:10 +01:00
Code Activity

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

Browse Source 
Fix keytool parsing error due to localisation keytool -list command.
Always fallback to english so the parsing makes sense.
This commit is contained in:
Cyril Russo 2018-08-17 15:32:29 +02:00
parent 05be4bc814
commit 4f21045cad
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/config.py
View File

@ -118,6 +118,9 @@ The repository of older versions of applications from the main demo repository.
# keystore. # keystore.
# repo_pubkey = "..." # repo_pubkey = "..."
# The keytool command to run to get Java's keytool version
keytool = "keytool"
# The keystore to use for release keys when building. This needs to be # The keystore to use for release keys when building. This needs to be
# somewhere safe and secure, and backed up! The best way to manage these # somewhere safe and secure, and backed up! The best way to manage these
# sensitive keys is to use a "smartcard" (aka Hardware Security Module). To # sensitive keys is to use a "smartcard" (aka Hardware Security Module). To

5
fdroidserver/common.py
View File

@ -2907,7 +2907,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 +2917,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',