Expand pixmap (island name) listboxes as necessary

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

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index f4fb346c99466023e12d209ee5ce08f3d498f54a..4d988db4ae7e28b854eac40330b9ecd4d84ebfbe 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -88,10 +88,12 @@ sub parse_info1 ($$) {
            @ctx= (sub { push @nocm, lc $_; });
        } elsif (m/^ocean (\w+)$/) {
            my $ocean= $1;
+           keys %{ $oceans{$ocean} };
            @ctx= (sub {
                $ocean or die; # ref to $ocean needed to work
                               # around a perl bug
                my $arch= $_;
+               keys %{ $oceans{$ocean}{$arch} };
                $ctx[1]= sub {
                    $oceans{$ocean}{$arch}{$_} .= $src;
                };
@@ -176,7 +178,7 @@ sub parse_info1 ($$) {
 sub parse_info_clientside () {
     my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
     return unless $yarrg;
-    my $master= fetch_with_rsync("info-$masterinfoversion");
+    my $master= fetch_with_rsync("info-v$masterinfoversion");
     parse_info1($master,'s');
     my $local= '_local-info.txt';
     if (stat $local) {
@@ -223,7 +225,7 @@ sub parse_info_serverside () {
 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');
 }
 
 sub parse_pctb_commodmap () {
@@ -247,9 +249,16 @@ sub parse_pctb_commodmap () {
 sub get_our_version ($$) {
     my ($aref,$prefix) = @_;
     $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
-    $aref->{"${prefix}fixes"}= 'lastpage';
-
-    my $version= `git-describe --tags HEAD || echo 0unknown`; $? and die $?;
+    $aref->{"${prefix}fixes"}= 'lastpage checkpager';
+
+    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;