1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-11 15:13:27 +02:00

Fix 'fdroid update' regression

This is from MR !48. It refuses to update because there is no 'keypass'
or 'keystorepass' in the config. These shouldn't be in the config of any
properly set up existing repo in the first place. They certainly aren't
in any of mine (as a result of which, it refused to work on any of
them!)
This commit is contained in:
Ciaran Gultnieks 2015-05-15 21:36:12 +01:00
parent f345b24816
commit 4178b34351

View File

@ -750,10 +750,10 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
if not 'keystore' in config:
nosigningkey = True
logging.critical("'keystore' not found in config.py!")
if not 'keystorepass' in config:
if not 'keystorepass' in config and not 'keystorepassfile' in config:
nosigningkey = True
logging.critical("'keystorepass' not found in config.py!")
if not 'keypass' in config:
if not 'keypass' in config and not 'keypassfile' in config:
nosigningkey = True
logging.critical("'keypass' not found in config.py!")
if not os.path.exists(config['keystore']):