From 00c2cc969a47f9e3f7e294910b31d365dd9a9ba7 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 6 Oct 2020 11:39:46 +0200
Subject: [PATCH] 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 <http://www.gnu.org/licenses/>.
 
+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)