From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Thu, 10 Sep 2009 18:50:06 +0000 (+0100)
Subject: Merge branch 'stable-3.x'
X-Git-Tag: 5.0^2~143
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=commitdiff_plain;h=555b3391b3cd9967a29b219fff242b583137d2b8

Merge branch 'stable-3.x'
---

555b3391b3cd9967a29b219fff242b583137d2b8
diff --cc yarrg/Commods.pm
index 44cc74e,b58471c..9c82818
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@@ -204,8 -201,23 +201,8 @@@ sub fetch_with_rsync ($) 
      return $local;
  }
  
 -sub parse_info_maproutes ($$$) {
 -    my ($on, $allislands, $routemap) = @_;;
 -    foreach my $k (sort keys %$routemap) {
 -	my @ok= grep { index($_,$k) >= 0 } @$allislands;
 -	die "ambiguous $k" if @ok>1;
 -	if (!@ok) {
 -	    $route_mysteries{$on}{$k}++;
 -	    delete $routemap->{$k};
 -	} elsif ($ok[0] ne $k) {
 -	    $routemap->{$ok[0]}= $routemap->{$k};
 -	    delete $routemap->{$k};
 -	}
 -    }
 -}
 -
  sub parse_info_serverside () {
-     parse_info1('source-info.txt','s');
+     parse_info1('source-info.txt','s',0);
  }
  sub parse_info_serverside_ocean ($) {
      my ($oceanname) = @_;