From: Clare <clareb@harley.(none)>
Date: Sun, 16 Aug 2009 20:39:20 +0000 (+0100)
Subject: Fixes from tests on harley, including horrid bodge for git-describe failure
X-Git-Tag: 3.2~4^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=e8c5c5b21c2003f7c2cb517efbe98dc77e0d3fd4

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

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index b90e6d7..f81e1b8 100644
--- 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//; }
 
-    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>) {
@@ -216,7 +216,7 @@ sub get_our_version ($$) {
     $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;
@@ -302,7 +302,8 @@ sub cgipostform ($$$) {
 	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();
     }
 }