From 75cdb1fd9795f7e8bd50b7cf1fd13723d83cd262 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 6 Oct 2020 11:31:22 +0200 Subject: [PATCH 1/3] update: remove -b / --buildreport which has done nothing since 2013 The functionality was removed in 48296df5b0bd2a93d37f72ffe10cf6f955f21767 --- completion/bash-completion | 4 ++-- fdroidserver/update.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/completion/bash-completion b/completion/bash-completion index 5f21621e..1686abba 100644 --- a/completion/bash-completion +++ b/completion/bash-completion @@ -125,8 +125,8 @@ __complete_install() { } __complete_update() { - opts="-c -v -q -b -i -I -e -w" - lopts="--create-metadata --verbose --quiet --buildreport + opts="-c -v -q -i -I -e -w" + lopts="--create-metadata --verbose --quiet --icons --wiki --pretty --clean --delete-unknown --nosign --rename-apks --use-date-from-apk" case "${prev}" in diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 1708700a..2a0cca1a 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -2270,8 +2270,6 @@ def main(): help=_("Add skeleton metadata files for APKs that are missing them")) parser.add_argument("--delete-unknown", action="store_true", default=False, help=_("Delete APKs and/or OBBs without metadata from the repo")) - parser.add_argument("-b", "--buildreport", action="store_true", default=False, - help=_("Report on build data status")) parser.add_argument("-I", "--icons", action="store_true", default=False, help=_("Resize all the icons exceeding the max pixel size and exit")) parser.add_argument("-w", "--wiki", default=False, action="store_true", From 00c2cc969a47f9e3f7e294910b31d365dd9a9ba7 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 6 Oct 2020 11:39:46 +0200 Subject: [PATCH 2/3] update: deprecate --wiki option, the wiki is going away --- completion/bash-completion | 8 ++++---- fdroidserver/update.py | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/completion/bash-completion b/completion/bash-completion index 1686abba..751e5b24 100644 --- a/completion/bash-completion +++ b/completion/bash-completion @@ -81,9 +81,9 @@ __complete_options() { } __complete_build() { - opts="-v -q -l -s -t -f -a -w" + opts="-v -q -l -s -t -f -a" - lopts="--verbose --quiet --latest --stop --test --server --reset-server --skip-scan --scan-binary --no-tarball --force --all --wiki --no-refresh" + lopts="--verbose --quiet --latest --stop --test --server --reset-server --skip-scan --scan-binary --no-tarball --force --all --no-refresh" case "${prev}" in :) __vercode @@ -125,9 +125,9 @@ __complete_install() { } __complete_update() { - opts="-c -v -q -i -I -e -w" + opts="-c -v -q -i -I -e" lopts="--create-metadata --verbose --quiet - --icons --wiki --pretty --clean --delete-unknown + --icons --pretty --clean --delete-unknown --nosign --rename-apks --use-date-from-apk" case "${prev}" in -e|--editor) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 2a0cca1a..9a2f80d4 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -19,6 +19,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +import argparse import sys import os import shutil @@ -2273,7 +2274,7 @@ def main(): parser.add_argument("-I", "--icons", action="store_true", default=False, help=_("Resize all the icons exceeding the max pixel size and exit")) parser.add_argument("-w", "--wiki", default=False, action="store_true", - help=_("Update the wiki")) + help=argparse.SUPPRESS) parser.add_argument("--pretty", action="store_true", default=False, help=_("Produce human-readable XML/JSON for index files")) parser.add_argument("--clean", action="store_true", default=False, @@ -2443,6 +2444,7 @@ def main(): # Update the wiki... if options.wiki: + logging.warning(_('wiki support is deprecated and will be removed in the next release!')) update_wiki(apps, apks + archapks) status_update_json(apps, apks + archapks) From ae3c9c055214653750af386f63bd0e7241ea98d7 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 6 Oct 2020 16:35:07 +0200 Subject: [PATCH 3/3] change make_current_version_link to default to False This is semi-broken and barely used, it should be off by default for 2.0. --- CHANGELOG.md | 1 + fdroidserver/common.py | 2 +- tests/run-tests | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e34660ad..3c4f69a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Removed * removed support for txt and json metadata ([!772](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/772)) +* `make_current_version_link` is now off by default ## [1.1.4] - 2019-08-15 ### Fixed diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 2cdf0098..677baf04 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -124,7 +124,7 @@ default_config = { 'sync_from_local_copy_dir': False, 'allow_disabled_algorithms': False, 'per_app_repos': False, - 'make_current_version_link': True, + 'make_current_version_link': False, 'current_version_name_source': 'Name', 'deploy_process_logs': False, 'update_stats': False, diff --git a/tests/run-tests b/tests/run-tests index 5a5cc232..66b00ed7 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -165,6 +165,7 @@ if which zipalign || ls -1 $ANDROID_HOME/build-tools/*/zipalign; then cd $REPOROOT cp $WORKSPACE/tests/keystore.jks $REPOROOT/ $fdroid init --keystore keystore.jks --repo-keyalias=sova + echo 'make_current_version_link = True' >> config.py echo 'keystorepass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py echo 'keypass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py echo 'keydname = "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"' >> config.py