mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix --nosign semantics

Browse source 
This reverts parts of 197ca7e36 as it never triggered the
FDroidException as 'keystore' not in common.config is always False.
This commit is contained in:
Jochen Sprickerhof 2022-05-17 23:46:44 +02:00 • committed by Hans-Christoph Steiner
parent c3243c2cdf
commit 9933f54093
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/index.py
View file

@ -66,10 +66,7 @@ def make(apps, apks, repodir, archive):
""" """
from fdroidserver.update import METADATA_VERSION from fdroidserver.update import METADATA_VERSION
if hasattr(common.options, 'nosign') and common.options.nosign: if not hasattr(common.options, 'nosign') or not common.options.nosign:
if 'keystore' not in common.config and 'repo_pubkey' not in common.config:
raise FDroidException(_('"repo_pubkey" must be present in config.yml when using --nosign!'))
else:
common.assert_config_keystore(common.config) common.assert_config_keystore(common.config)
# Historically the index has been sorted by App Name, so we enforce this ordering here # Historically the index has been sorted by App Name, so we enforce this ordering here
@ -1378,7 +1375,7 @@ def extract_pubkey():
""" """
if 'repo_pubkey' in common.config: if 'repo_pubkey' in common.config:
pubkey = unhexlify(common.config['repo_pubkey']) pubkey = unhexlify(common.config['repo_pubkey'])
else: elif 'keystorepass' in common.config:
env_vars = {'LC_ALL': 'C.UTF-8', env_vars = {'LC_ALL': 'C.UTF-8',
'FDROID_KEY_STORE_PASS': common.config['keystorepass']} 'FDROID_KEY_STORE_PASS': common.config['keystorepass']}
p = FDroidPopenBytes([common.config['keytool'], '-exportcert', p = FDroidPopenBytes([common.config['keytool'], '-exportcert',
@ -1393,6 +1390,9 @@ def extract_pubkey():
msg += ' Is your crypto smartcard plugged in?' msg += ' Is your crypto smartcard plugged in?'
raise FDroidException(msg) raise FDroidException(msg)
pubkey = p.output pubkey = p.output
else:
raise FDroidException(_('Neither "repo_pubkey" nor "keystorepass" set in config.yml'))
repo_pubkey_fingerprint = common.get_cert_fingerprint(pubkey) repo_pubkey_fingerprint = common.get_cert_fingerprint(pubkey)
return hexlify(pubkey), repo_pubkey_fingerprint return hexlify(pubkey), repo_pubkey_fingerprint