From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 25 Aug 2009 16:12:43 +0000 (+0100)
Subject: Merge branch 'web' of /u/ijackson/things/ypp-sc-tools
X-Git-Tag: 3.4~104
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=d2bd9c727af4d792bc6ee4806e19ceb7236c62d3;hp=6d33c3a7453e6b13057cda116d3dadd52d4bcd0b

Merge branch 'web' of /u/ijackson/things/ypp-sc-tools
---

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 1eae15e..3f0f5f5 100644
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -69,7 +69,7 @@ sub sourcebasedir () {
     return $dir;
 }
 
-my datadir () {
+sub datadir () {
     my $dir= sourcebasedir();
     if (stat "$dir/DATA") {
 	return "$dir/DATA";
@@ -84,6 +84,7 @@ my datadir () {
 my @ocean_list;
 
 sub ocean_list () {
+    my $datadir= datadir();
     if (!@ocean_list) {
 	my $fn= "$datadir/master-info.txt";
 	my $f= new IO::File $fn or die $!;