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.db-test.git;a=commitdiff_plain;h=5f3c445b5b9eda482c8098c115a9b5282e55f001;hp=663db396d271b241a8ec76bd44fbda9ec432e10f

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

diff --git a/yarrg/commod-update-receiver b/yarrg/commod-update-receiver
index 123ca0c..2059ad7 100755
--- a/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@ -129,7 +129,7 @@ foreach my $islands (values %$arches) {
 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");
diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index ce319fa..b198b9b 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -546,7 +546,7 @@ if ($qa->{'debug'}) {
 		my ($varname, $qty) = m/^
 			\s* \d+ \s+
 			(\w+) \s+ (?: [A-Z*]+ \s+ )?
-			([0-9.]+) \s
+			([+-e0-9.]+) \s
 			/x or die "$cplex \n==\n $glpsol_out $_ ?";
 		if ($varname =~ m/^f(\d+)s(\d+)_/) {
 			my ($ix,$orgix) = ($1,$2);