From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 25 Aug 2009 16:16:46 +0000 (+0100)
Subject: Fix broken sourcedir things
X-Git-Tag: 3.4~103
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=commitdiff_plain;h=c11d6fe65e9be995358d5f6d7657b3cff03ff40f;hp=d2bd9c727af4d792bc6ee4806e19ceb7236c62d3

Fix broken sourcedir things
---

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 3f0f5f5..036c7e9 100644
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -57,20 +57,23 @@ BEGIN {
     @EXPORT_OK   = qw();
 }
 
-sub sourcebasedir () {
+sub dotperllibdir () {
     my $dir;
     
     for my $dir (@INC) {
 	if ($dir =~ m/\.perl-lib$/) {
-	    return "$dir/..";
+	    return $dir;
 	}
     }
-    die "no source base dir in @INC";
-    return $dir;
+    die "no appropriate dotperllib dir in @INC";
+}
+
+sub sourcebasedir () {
+    return dotperllibdir().'/..';
 }
 
 sub datadir () {
-    my $dir= sourcebasedir();
+    my $dir= dotperllibdir();
     if (stat "$dir/DATA") {
 	return "$dir/DATA";
     } elsif ($!==&ENOENT) {
@@ -87,7 +90,7 @@ sub ocean_list () {
     my $datadir= datadir();
     if (!@ocean_list) {
 	my $fn= "$datadir/master-info.txt";
-	my $f= new IO::File $fn or die $!;
+	my $f= new IO::File $fn or die "$fn $!";
 	my @r;
 	while (<$f>) {
 	    next unless m/^ocean\s+(\S.*\S)\s*$/;