From: Hans-Christoph Steiner Date: Mon, 10 Apr 2017 18:14:18 +0000 (+0200) Subject: simplify Android Observatory config X-Git-Tag: 0.8~82^2~1 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e3152e9ef00079fe12813faa2c5246c9ab053021;p=fdroidserver.git simplify Android Observatory config This just keeps the config key name simple and direct. --- diff --git a/examples/config.py b/examples/config.py index 9d0b8d04..b41ca4ac 100644 --- a/examples/config.py +++ b/examples/config.py @@ -223,7 +223,7 @@ The repository of older versions of applications from the main demo repository. # If you want to upload the release apk file to androidobservatory.org # -# uploadto_androidobservatory = False +# androidobservatory = False # If you want to upload the release apk file to virustotal.com diff --git a/fdroidserver/server.py b/fdroidserver/server.py index e2969037..704c779a 100644 --- a/fdroidserver/server.py +++ b/fdroidserver/server.py @@ -376,11 +376,11 @@ def main(): if not config.get('awsbucket') \ and not config.get('serverwebroot') \ and not config.get('servergitmirrors') \ - and not config.get('uploadto_androidobservatory') \ + and not config.get('androidobservatory') \ and not config.get('virustotal_apikey') \ and local_copy_dir is None: logging.warn('No option set! Edit your config.py to set at least one among:\n' - + 'serverwebroot, servergitmirrors, local_copy_dir, awsbucket, virustotal_apikey or uploadto_androidobservatory') + + 'serverwebroot, servergitmirrors, local_copy_dir, awsbucket, virustotal_apikey or androidobservatory') sys.exit(1) repo_sections = ['repo'] @@ -428,7 +428,7 @@ def main(): update_servergitmirrors(servergitmirrors, repo_section) if config.get('awsbucket'): update_awsbucket(repo_section) - if config.get('uploadto_androidobservatory'): + if config.get('androidobservatory'): upload_to_android_observatory(repo_section) if config.get('virustotal_apikey'): upload_to_virustotal(repo_section, config.get('virustotal_apikey'))