Merge branch 'test-install'

[ypp-sc-tools.db-live.git] / yarrg / CommodsWeb.pm

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 036c7e99ffe4dd48a55324578f58aaa00754e4d1..198185d32df4f1855fd4ca691d809b482f91bf04 100644 (file)
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -73,6 +73,8 @@ sub sourcebasedir () {
 }
 
 sub datadir () {
+    my $edir= $ENV{'YARRG_DATA_DIR'};
+    return $edir if defined $edir;
     my $dir= dotperllibdir();
     if (stat "$dir/DATA") {
        return "$dir/DATA";
@@ -89,7 +91,7 @@ my @ocean_list;
 sub ocean_list () {
     my $datadir= datadir();
     if (!@ocean_list) {
-       my $fn= "$datadir/master-info.txt";
+       my $fn= "$datadir/source-info.txt";
        my $f= new IO::File $fn or die "$fn $!";
        my @r;
        while (<$f>) {