From 4178b343513f33c1b24fcf1b0f03da13a0f9783f Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Fri, 15 May 2015 21:36:12 +0100 Subject: [PATCH] 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!) --- fdroidserver/update.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 9ff3c043..d154173b 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -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']): -- 2.30.2