From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 14 Aug 2009 18:45:55 +0000 (+0100)
Subject: Merge branch 'master' of ../ypp-sc-tools
X-Git-Tag: 3.4~26^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=82b751aa6a01748622fd351e831c459cf044072e;hp=-c

Merge branch 'master' of ../ypp-sc-tools
---

82b751aa6a01748622fd351e831c459cf044072e
diff --combined yarrg/commod-update-receiver
index cd9ef83,889913d..3ae1a62
--- a/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@@ -25,20 -25,6 +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;
@@@ -147,10 -133,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,