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

change config.py to config.yml everywhere it is needed

Browse source
This commit is contained in:
Hans-Christoph Steiner 2021-01-29 13:24:17 +01:00
parent f48ea06adb
commit 97d5933a05
45 changed files with 630 additions and 630 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/common.py
View file

@ -3372,7 +3372,7 @@ def compare_apks(apk1, apk2, tmp_dir, log_dir=None):
def set_command_in_config(command):
'''Try to find specified command in the path, if it hasn't been
manually set in config.py. If found, it is added to the config
manually set in config.yml. If found, it is added to the config
dict. The return value says whether the command is available.
'''
@ -3524,9 +3524,9 @@ def load_stats_fdroid_signing_key_fingerprints():
repo_key_sig = config.get('repo_key_sha256')
if repo_key_sig:
if jar_sigkey != repo_key_sig:
raise FDroidException("Signature key fingerprint of file '{}' does not match repo_key_sha256 in config.py (found fingerprint: '{}')".format(jar_file, jar_sigkey))
raise FDroidException("Signature key fingerprint of file '{}' does not match repo_key_sha256 in config.yml (found fingerprint: '{}')".format(jar_file, jar_sigkey))
else:
logging.warning("repo_key_sha256 not in config.py, setting it to the signature key fingerprint of '{}'".format(jar_file))
logging.warning("repo_key_sha256 not in config.yml, setting it to the signature key fingerprint of '{}'".format(jar_file))
config['repo_key_sha256'] = jar_sigkey
write_to_config(config, 'repo_key_sha256')

4
fdroidserver/deploy.py
View file

@ -147,7 +147,7 @@ def update_awsbucket_libcloud(repo_section):
subdirectories) to the AWS S3 "bucket". The contents of that subdir of the
bucket will first be deleted.
Requires AWS credentials set in config.py: awsaccesskeyid, awssecretkey
Requires AWS credentials set in config.yml: awsaccesskeyid, awssecretkey
'''
logging.debug(_('using Apache libcloud to sync with {url}')
@ -770,7 +770,7 @@ def main():
and not config.get('binary_transparency_remote') \
and not config.get('virustotal_apikey') \
and local_copy_dir is None:
logging.warning(_('No option set! Edit your config.py to set at least one of these:')
logging.warning(_('No option set! Edit your config.yml to set at least one of these:')
+ '\nserverwebroot, servergitmirrors, local_copy_dir, awsbucket, '
+ 'virustotal_apikey, androidobservatory, or binary_transparency_remote')
sys.exit(1)

2
fdroidserver/index.py
View file

@ -59,7 +59,7 @@ def make(apps, apks, repodir, archive):
if hasattr(common.options, 'nosign') and 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.py when using --nosign!'))
raise FDroidException(_('"repo_pubkey" must be present in config.yml when using --nosign!'))
else:
common.assert_config_keystore(common.config)

2
fdroidserver/stats.py
View file

@ -75,7 +75,7 @@ def main():
config = common.read_config(options)
if not config['update_stats']:
logging.info("Stats are disabled - set \"update_stats = True\" in your config.py")
logging.info("Stats are disabled - set \"update_stats = True\" in your config.yml")
sys.exit(1)
# Get all metadata-defined apps...