Merge branch 'stable-3.x'

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

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 44cc74e8543b91b885ee76082cb3ea0042d5f3fd..9c8281876f334b99578e73622cf95f00e9ec6259 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -74,9 +74,13 @@ my (@rawcm, @nocm); # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth'
 #  when extending the format of source-info in a non-backward
 #  compatible way, be sure to update update-master-info too.
 
 #  when extending the format of source-info in a non-backward
 #  compatible way, be sure to update update-master-info too.
 

-sub parse_info1 ($$) {
-    my ($mmfn,$src)= @_;
-    my $mm= new IO::File $mmfn, 'r' or die "$mmfn $!";
+sub parse_info1 ($$$) {
+    my ($mmfn,$src,$enoentok)= @_;
+    my $mm= new IO::File $mmfn, 'r';
+    if (!$mm) {
+       return if $enoentok && $!==&ENOENT;
+       die "$mmfn $!";
+    }

     my @ctx= ();
     while (<$mm>) {
        next if m/^\s*\#/;
     my @ctx= ();
     while (<$mm>) {
        next if m/^\s*\#/;


@@ -176,16 +180,9 @@ sub parse_info1 ($$) {
 }
 
 sub parse_info_clientside () {
 }
 
 sub parse_info_clientside () {

-    my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
-    return unless $yarrg;
-    my $master= fetch_with_rsync("info-$masterinfoversion");
-    parse_info1($master,'s');
-    my $local= '_local-info.txt';
-    if (stat $local) {
-       parse_info1($local,'s');
-    } else {
-       die "$local $!" unless $! == &ENOENT;
-    }
+    my $master= fetch_with_rsync("info-v$masterinfoversion");
+    parse_info1($master,'s',1);
+    parse_info1('_local-info.txt','s',1);

 }
 
 sub fetch_with_rsync ($) {
 }
 
 sub fetch_with_rsync ($) {


@@ -205,12 +202,12 @@ sub fetch_with_rsync ($) {
 }
 
 sub parse_info_serverside () {
 }
 
 sub parse_info_serverside () {

-    parse_info1('source-info.txt','s');
+    parse_info1('source-info.txt','s',0);

 }
 sub parse_info_serverside_ocean ($) {
     my ($oceanname) = @_;
     die "unknown ocean $oceanname ?" unless exists $oceans{$oceanname};
 }
 sub parse_info_serverside_ocean ($) {
     my ($oceanname) = @_;
     die "unknown ocean $oceanname ?" unless exists $oceans{$oceanname};

-    parse_info1("_ocean-".(lc $oceanname).".txt",'s');
+    parse_info1("_ocean-".(lc $oceanname).".txt", 's',0);

 }
 
 sub parse_pctb_commodmap () {
 }
 
 sub parse_pctb_commodmap () {


@@ -236,7 +233,14 @@ sub get_our_version ($$) {
     $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
     $aref->{"${prefix}fixes"}= 'lastpage checkpager';
 
     $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
     $aref->{"${prefix}fixes"}= 'lastpage checkpager';
 

-    my $version= `git-describe --tags HEAD || echo 0unknown`; $? and die $?;
+    my $version= `
+       if type -p git-describe >/dev/null 2>&1; then
+               gd=git-describe
+       else
+               gd="git describe"
+       fi
+       \$gd --tags HEAD || echo 0unknown
+    `; $? and die $?;

     chomp($version);
     $aref->{"${prefix}version"}= $version;
     return $aref;
     chomp($version);
     $aref->{"${prefix}version"}= $version;
     return $aref;