Fixes from tests on harley, including horrid bodge for git-describe failure

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index b90e6d7bff2f27e25689d8b3be7e91be3b52e32b..f81e1b8dff0863247ab3c8aca83aaab5ac32b23e 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -197,7 +197,7 @@ sub parse_pctb_commodmap () {
     undef %pctb_commodmap;
     foreach my $commod (keys %commods) { $commods{$commod} =~ s/b//; }
 
     undef %pctb_commodmap;
     foreach my $commod (keys %commods) { $commods{$commod} =~ s/b//; }
 

-    my $c= new IO::File '_commodmap.tsv' or die $!;
+    my $c= new IO::File '_commodmap.tsv';

     if (!$c) { $!==&ENOENT or die $!; return 0; }
 
     while (<$c>) {
     if (!$c) { $!==&ENOENT or die $!; return 0; }
 
     while (<$c>) {


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

-    my $version= `git-describe --tags HEAD`; $? and die $?;
+    my $version= `git-describe --tags HEAD || echo 0unknown`; $? and die $?;

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


@@ -302,7 +302,8 @@ sub cgipostform ($$$) {
        return $';
     } else {
        my $resp= $ua->request($req);
        return $';
     } else {
        my $resp= $ua->request($req);

-       die $resp->status_line unless $resp->is_success;
+       die $resp->status_line."\n".$resp->content."\n "
+           unless $resp->is_success;

        return $resp->content();
     }
 }
        return $resp->content();
     }
 }