From b80a8f5ce910eeaf997aeacd66c814a89439184e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 5 Apr 2017 13:45:02 +0100 Subject: [PATCH] ownsource download names are internal names Signed-off-by: Ian Jackson --- .gitignore | 4 ++-- hippotatd | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a4deb5d..fd96470 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ data.dump.dbg [tuv] tmp -source -srcpkgs +srcbomb.tar.gz +srcpkgsbomb.tar diff --git a/hippotatd b/hippotatd index 399dfe7..aefa458 100755 --- a/hippotatd +++ b/hippotatd @@ -234,17 +234,24 @@ class IphttpResource(NotStupidResource): log_debug(DBG.HTTP_CTRL, '...', idof=id(request)) return NOT_DONE_YET + # instantiator should set + # self.hippotat_sources = (source_names[0], source_names[1]) + def __init__(self): + self.hippotat_sources = [None, None] + super().__init__() + def render_GET(self, request): log_debug(DBG.HTTP, 'GET request') - return b''' + return (''' hippotat

-source -(and that of dependency packages) +source +(and that of dependency packages) available ''' + % tuple(self.hippotat_sources)).encode('utf-8') def start_http(): resource = IphttpResource() @@ -268,8 +275,12 @@ def start_http(): if DBG.OWNSOURCE in debug_set: ssp.stream_debug = sys.stdout ssp.generate() - resource.putChild(b'source', twisted.web.static.File(ssp.output_paths[0])) - resource.putChild(b'srcpkgs', twisted.web.static.File(ssp.output_paths[1])) + for ix in (0,1): + bn = ssp.output_names[ix] + op = ssp.output_paths[ix] + resource.hippotat_sources[ix] = bn + subresource =twisted.web.static.File(op) + resource.putChild(bn.encode('utf-8'), subresource) reactor.callLater(0.1, (lambda: log.info('hippotatd started', dflag=False))) -- 2.30.2