better error message in publish when repo_key is not set

This commit is contained in:
Michael Pöhn 2017-10-16 18:11:57 +02:00
parent e5acdee21e
commit 788c8f97fd
4 changed files with 42 additions and 19 deletions

View file

@ -63,26 +63,8 @@ def make(apps, sortedids, apks, repodir, archive):
return "fdroid.app:" + appid, apps[appid].Name
raise MetaDataException("Cannot resolve app id " + appid)
nosigningkey = False
if not common.options.nosign:
if 'repo_keyalias' not in common.config:
nosigningkey = True
logging.critical(_("'repo_keyalias' not found in config.py!"))
if 'keystore' not in common.config:
nosigningkey = True
logging.critical(_("'keystore' not found in config.py!"))
if 'keystorepass' not in common.config:
nosigningkey = True
logging.critical(_("'keystorepass' not found in config.py!"))
if 'keypass' not in common.config:
nosigningkey = True
logging.critical(_("'keypass' not found in config.py!"))
if not os.path.exists(common.config['keystore']):
nosigningkey = True
logging.critical("'" + common.config['keystore'] + "' does not exist!")
if nosigningkey:
raise FDroidException("`fdroid update` requires a signing key, " +
"you can create one using: fdroid update --create-key")
common.assert_config_keystore(common.config)
repodict = collections.OrderedDict()
repodict['timestamp'] = datetime.utcnow()