kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

Merge branch 'hide-on-server-cli-flag' into 'master'

Browse Source 
fdroid build: hide --on-server cli flag

See merge request fdroid/fdroidserver!617
This commit is contained in:
Hans-Christoph Steiner 2019-01-29 11:41:15 +00:00
commit 965b544150
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fdroidserver/build.py
View File

@ -31,8 +31,8 @@ import traceback
import time import time
import requests import requests
import tempfile import tempfile
import argparse
from configparser import ConfigParser from configparser import ConfigParser
from argparse import ArgumentParser
import logging import logging
from gettext import ngettext from gettext import ngettext
@ -863,7 +863,7 @@ def force_halt_build(timeout):
def parse_commandline(): def parse_commandline():
"""Parse the command line. Returns options, parser.""" """Parse the command line. Returns options, parser."""
parser = ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]") parser = argparse.ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
common.setup_global_opts(parser) common.setup_global_opts(parser)
parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]")) parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
parser.add_argument("-l", "--latest", action="store_true", default=False, parser.add_argument("-l", "--latest", action="store_true", default=False,
@ -876,8 +876,10 @@ def parse_commandline():
help=_("Use build server")) help=_("Use build server"))
parser.add_argument("--reset-server", action="store_true", default=False, parser.add_argument("--reset-server", action="store_true", default=False,
help=_("Reset and create a brand new build server, even if the existing one appears to be ok.")) help=_("Reset and create a brand new build server, even if the existing one appears to be ok."))
# this option is internal API for telling fdroid that
# it's running inside a buildserver vm.
parser.add_argument("--on-server", dest="onserver", action="store_true", default=False, parser.add_argument("--on-server", dest="onserver", action="store_true", default=False,
help=_("Specify that we're running on the build server")) help=argparse.SUPPRESS)
parser.add_argument("--skip-scan", dest="skipscan", action="store_true", default=False, parser.add_argument("--skip-scan", dest="skipscan", action="store_true", default=False,
help=_("Skip scanning the source code for binaries and other problems")) help=_("Skip scanning the source code for binaries and other problems"))
parser.add_argument("--dscanner", action="store_true", default=False, parser.add_argument("--dscanner", action="store_true", default=False,