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

Merge branch '2.0-deprecations' into 'master'

Browse source 
2.0 deprecations in `fdroid update`

See merge request fdroid/fdroidserver!813
This commit is contained in:
Michael Pöhn 2020-10-14 13:14:49 +00:00
commit e63eb7cd2f
5 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/common.py
View file

@ -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,

6
fdroidserver/update.py
View file

@ -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
@ -2270,12 +2271,10 @@ 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",
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,
@ -2445,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)