From 3c50650150eb06d783d14d6d9fd01ba38532a4ff Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 5 Apr 2017 14:01:45 +0100 Subject: [PATCH] hippotatd: --ownsource-local etc. options Signed-off-by: Ian Jackson --- hippotatd | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/hippotatd b/hippotatd index ec47c1d..0ef6369 100755 --- a/hippotatd +++ b/hippotatd @@ -242,16 +242,17 @@ class IphttpResource(NotStupidResource): def render_GET(self, request): log_debug(DBG.HTTP, 'GET request') - return (''' - -hippotat -

-source -(and that of dependency packages) -available - -''' - % tuple(self.hippotat_sources)).encode('utf-8') + s = 'hippotat\n' + (s0,s1) = self.hippotat_sources + if s0: + s += '

source\n' % s0 + if self.hippotat_sources[1]: + s += ('(and that of dependency packages)\n' % s1) + s += 'available' + else: + s += 'TESTING' + s += '' + return s.encode('utf-8') def start_http(): resource = IphttpResource() @@ -273,11 +274,13 @@ def start_http(): ssp = SourceShipmentPreparer(td) ssp.logger = partial(log_debug, DBG.OWNSOURCE) if DBG.OWNSOURCE in debug_set: ssp.stream_debug = sys.stdout - ssp.generate() + ssp.download_packages = opts.ownsource >= 2 + if opts.ownsource >= 1: ssp.generate() for ix in (0,1): bn = ssp.output_names[ix] op = ssp.output_paths[ix] + if op is None: continue resource.hippotat_sources[ix] = bn subresource =twisted.web.static.File(op) resource.putChild(bn.encode('utf-8'), subresource) @@ -338,6 +341,18 @@ def catch_termination(): for sig in (signal.SIGINT, signal.SIGTERM): signal.signal(sig, partial(signal_handler, sig.name)) +optparser.add_option('--ownsource', default=2, + action='store_const', dest='ownsource', const=2, + help='source download fully enabled (default)') + +optparser.add_option('--ownsource-local', + action='store_const', dest='ownsource', const=1, + help='source download is local source code only') + +optparser.add_option('--no-ownsource', + action='store_const', dest='ownsource', const=0, + help='source download disabled (for testing only)') + common_startup(process_cfg) catch_termination() ipif = start_ipif(c.ipif_command, (lambda p,s,d: route(p,"[ipif]",s,d))) -- 2.11.0