X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=hippotatd;h=399dfe710f0c1b333b59afa82bf1cc5d5f1a494b;hb=06e61e3b6ee50510264533b4064c7047c8e89b28;hp=24aca7c41232dac2aee0cc487e499ba4c493afe1;hpb=1596efe15697647f7ba4fed196fa4343946283d2;p=hippotat.git diff --git a/hippotatd b/hippotatd index 24aca7c..399dfe7 100755 --- a/hippotatd +++ b/hippotatd @@ -5,22 +5,25 @@ # # Copyright 2017 Ian Jackson # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version, with the "CAF Login -# Exception" as published by Ian Jackson (version 2, or at your option -# any later version) as an Additional Permission. +# AGPLv3+ + CAFv2+ # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU Affero General Public +# License as published by the Free Software Foundation, either +# version 3 of the License, or (at your option) any later version, +# with the "CAF Login Exception" as published by Ian Jackson +# (version 2, or at your option any later version) as an Additional +# Permission. # -# You should have received a copy of the GNU Affero General Public -# License and the CAF Login Exception along with this program, in the -# file AGPLv3+CAFv2. If not, email Ian Jackson -# . +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public +# License and the CAF Login Exception along with this program, in +# the file AGPLv3+CAFv2. If not, email Ian Jackson +# . from hippotatlib import * @@ -262,10 +265,11 @@ 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() - resource.putChild(b'source', twisted.web.static.File(ssp.output_paths[0])) - resource.putChild(b'srcpkgs', twisted.web.static.File(ssp.output_paths[0])) + resource.putChild(b'source', twisted.web.static.File(ssp.output_paths[0])) + resource.putChild(b'srcpkgs', twisted.web.static.File(ssp.output_paths[1])) reactor.callLater(0.1, (lambda: log.info('hippotatd started', dflag=False)))