mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
Merge branch 'master' into 'master'
Option --resetserver does nothing; have it used instead See merge request fdroid/fdroidserver!449
This commit is contained in:
commit
4b0f9d6653
@ -90,7 +90,7 @@ __complete_options() {
|
|||||||
__complete_build() {
|
__complete_build() {
|
||||||
opts="-v -q -l -s -t -f -a -w"
|
opts="-v -q -l -s -t -f -a -w"
|
||||||
|
|
||||||
lopts="--verbose --quiet --latest --stop --test --server --resetserver
|
lopts="--verbose --quiet --latest --stop --test --server --reset-server
|
||||||
--on-server --skip-scan --no-tarball --force --all --wiki --no-refresh"
|
--on-server --skip-scan --no-tarball --force --all --wiki --no-refresh"
|
||||||
case "${cur}" in
|
case "${cur}" in
|
||||||
-*)
|
-*)
|
||||||
|
@ -73,7 +73,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
|
|||||||
else:
|
else:
|
||||||
logging.getLogger("paramiko").setLevel(logging.WARN)
|
logging.getLogger("paramiko").setLevel(logging.WARN)
|
||||||
|
|
||||||
sshinfo = vmtools.get_clean_builder('builder')
|
sshinfo = vmtools.get_clean_builder('builder', options.reset_server)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if not buildserverid:
|
if not buildserverid:
|
||||||
@ -935,7 +935,7 @@ def parse_commandline():
|
|||||||
help=_("Test mode - put output in the tmp directory only, and always build, even if the output already exists."))
|
help=_("Test mode - put output in the tmp directory only, and always build, even if the output already exists."))
|
||||||
parser.add_argument("--server", action="store_true", default=False,
|
parser.add_argument("--server", action="store_true", default=False,
|
||||||
help=_("Use build server"))
|
help=_("Use build server"))
|
||||||
parser.add_argument("--resetserver", 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."))
|
||||||
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=_("Specify that we're running on the build server"))
|
||||||
@ -1005,8 +1005,8 @@ def main():
|
|||||||
|
|
||||||
if config['build_server_always']:
|
if config['build_server_always']:
|
||||||
options.server = True
|
options.server = True
|
||||||
if options.resetserver and not options.server:
|
if options.reset_server and not options.server:
|
||||||
parser.error("option %s: Using --resetserver without --server makes no sense" % "resetserver")
|
parser.error("option %s: Using --reset-server without --server makes no sense" % "reset-server")
|
||||||
|
|
||||||
log_dir = 'logs'
|
log_dir = 'logs'
|
||||||
if not os.path.isdir(log_dir):
|
if not os.path.isdir(log_dir):
|
||||||
|
Loading…
Reference in New Issue
Block a user