From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 5 Nov 2009 16:33:19 +0000 (+0000)
Subject: Merge branch 'stable-5.x' into web
X-Git-Tag: 6.0~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=5f3c445b5b9eda482c8098c115a9b5282e55f001

Merge branch 'stable-5.x' into web
---

5f3c445b5b9eda482c8098c115a9b5282e55f001
diff --cc yarrg/commod-update-receiver
index 123ca0c,0ae5ba8..2059ad7
--- a/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@@ -126,10 -126,10 +126,10 @@@ foreach my $islands (values %$arches) 
      die if $island_found;
      $island_found= $sources;
  }
 -fail("unknown island") unless $island_found;
 +fail("unknown island ".errsan($o{'island'})) unless $island_found;
  
  $o{'timestamp'}= must_param('timestamp', "^([1-9]\\d{1,20})\$");
- fail("clock skew") if $o{'timestamp'} >= $now;
+ fail("clock skew") if $o{'timestamp'} > $now;
  
  my $indatafh= upload('data');
  defined $indatafh or fail("data is not a file");