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

Fixed precommit checks

Browse source
This commit is contained in:
Cyril Russo 2018-08-20 11:17:36 +02:00
parent 4303b0fac1
commit 81641b4628
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fdroidserver/common.py
View file

@ -236,7 +236,6 @@ 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:
thisconfig['jarsigner'] = shutil.which('jarsigner') thisconfig['jarsigner'] = shutil.which('jarsigner')
thisconfig['keytool'] = shutil.which('keytool') thisconfig['keytool'] = shutil.which('keytool')
@ -2913,7 +2912,7 @@ def genkeystore(localconfig):
'-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'], '-dname', localconfig['keydname'],
'-J-Duser.language=en'], envs=env_vars) '-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)