mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-08 18:31:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pubkey extraction on update

Browse source 
Fix pubkey extraction in case of non-empty _JAVA_OPTIONS
This commit is contained in:
Dmitriy Bogdanov 2016-02-17 22:22:57 +04:00
parent 8135760554
commit 7fc55a3847
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fdroidserver/update.py
View file

@ -716,7 +716,8 @@ def extract_pubkey():
'-alias', config['repo_keyalias'],
'-keystore', config['keystore'],
'-storepass:file', config['keystorepassfile']]
+ config['smartcardoptions'], output=False)
+ config['smartcardoptions'],
output=False, stderr_to_stdout=False)
if p.returncode != 0 or len(p.output) < 20:
msg = "Failed to get repo pubkey!"
if config['keystore'] == 'NONE':