X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fcommod-update-receiver;h=9558d387892c9f1a1732c52fad64e6deef1245d0;hb=324e19835d2f33a0eb55a2899a252f76551f134f;hp=9c8dd30eb68672e7e3a8bd4db3ca959fe1d97f07;hpb=4ce9cd1c69f7fd5114bafdca9307d3a09c67afce;p=ypp-sc-tools.main.git diff --git a/yarrg/commod-update-receiver b/yarrg/commod-update-receiver index 9c8dd30..9558d38 100755 --- a/yarrg/commod-update-receiver +++ b/yarrg/commod-update-receiver @@ -25,20 +25,6 @@ # are used without permission. This program is not endorsed or # sponsored by Three Rings. -# All calls contain: -# clientname "ypp-sc-tools" -# clientversion 2.1-g2e06a26 [from git-describe --tags HEAD] -# clientfixes "lastpage" [space separated list] -# -# Timestamp requests contain: -# requesttimestamp -# -# Uploads contain: -# ocean canonical mixed case -# island canonical mixed case -# data filename=deduped.tsv.gz output of yarrg --tsv - - use strict (qw(vars)); use POSIX; use MIME::Entity; @@ -63,7 +49,7 @@ sub fail ($) { print header(-status=>'400 Bad commodity update', -type=>'text/plain', -charset=>'us-ascii'); - print "Error: $msg\n"; + print "\nError: $msg\n"; exit 0; } @@ -147,9 +133,10 @@ foreach my $mid (<_mid-*.hold>) { unlink $mid or $!==&ENOENT or die "$mid $!"; } +$o{'instance'}= $ENV{'YARRG_INSTANCE'}; my $mcontent= MIME::Entity->build(To => 'yarrg-commod-updates', - Subject => $pwd, + Subject => $ENV{'YARRG_INSTANCE'}, Type => 'multipart/mixed', Boundary => '=', 'Message-ID' => $mid,