Fix 'fdroid update' regression

[fdroidserver.git] / fdroidserver / update.py

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 9ff3c0436d7fdda4706fb458ad92e24b1faa8796..d154173b3369e20da360aaf2c68a0559ef282f93 100644 (file)
--- 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']):