From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 10 Sep 2009 16:03:22 +0000 (+0100)
Subject: Gate parsing master-info-v* on YPPSC_YARRG_YARRG rather than YPPSC_YARRG_DICT_UPDATE... 
X-Git-Tag: 3.5^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=0e0de455b99b0543128005437b8c931b348edb75;hp=7074ce340ebe05c16b539567be551ac65322a5bb

Gate parsing master-info-v* on YPPSC_YARRG_YARRG rather than YPPSC_YARRG_DICT_UPDATE so --dict-no-update works better
---

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 83d308e..b58471c 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -180,8 +180,6 @@ sub parse_info1 ($$$) {
 }
 
 sub parse_info_clientside () {
-    my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
-    return unless $yarrg;
     my $master= fetch_with_rsync("info-v$masterinfoversion");
     parse_info1($master,'s',1);
     parse_info1('_local-info.txt','s',1);
diff --git a/yarrg/database-info-fetch b/yarrg/database-info-fetch
index 0757726..90db002 100755
--- a/yarrg/database-info-fetch
+++ b/yarrg/database-info-fetch
@@ -167,7 +167,7 @@ sub main__comparesources () {
 sub main__island () {
     my $ocean= get_ocean();
     
-    parse_info_clientside();
+    parse_info_clientside() if $ENV{'YPPSC_YARRG_YARRG'};
     get_arches_islands_pctb($ocean) if $pctb;
 
     for_islands($ocean,