From c84adaafcb6eaaa24903a785039bcc6515dd1420 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Mon, 3 Sep 2012 11:48:47 +0100 Subject: [PATCH] Added config to automatically always use build server --- config.sample.py | 5 +++++ fdroidserver/build.py | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/config.sample.py b/config.sample.py index 3d652cbd..695d337c 100644 --- a/config.sample.py +++ b/config.sample.py @@ -54,3 +54,8 @@ wiki_password = "1234" #machine. update_stats = False + +#Set this to true to always use a build server. This saves specifying the +#--server option on dedicated secure build server hosts. +build_server_always = False + diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 587be489..239b920e 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -451,10 +451,6 @@ def parse_commandline(): print "Force is only allowed in test mode" sys.exit(1) - if options.resetserver and not options.server: - print "Using --resetserver without --server makes no sense" - sys.exit(1) - return options, args options = None @@ -463,8 +459,15 @@ def main(): global options # Read configuration... + global build_server_always + build_server_always = False execfile('config.py', globals()) options, args = parse_commandline() + if build_server_always: + options.server = True + if options.resetserver and not options.server: + print "Using --resetserver without --server makes no sense" + sys.exit(1) # Get all apps... apps = common.read_metadata(options.verbose)