X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2FCommods.pm;h=f2823136fc69b89bb727af177e445055cfcfb3db;hp=65cf4eb03ad381cfef565c8635728c7d3e457ec0;hb=b020a18c3378347bc1469caad80ab22a5ea6a0a4;hpb=5054fcc355306f2bccdef9ea1aa8fb79488a9561

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 65cf4eb..f282313 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -41,7 +41,7 @@ BEGIN {
 		      &pipethrough_prep &pipethrough_run
 		      &pipethrough_run_along &pipethrough_run_finish
 		      &pipethrough_run_gzip
-		      &cgipostform &yarrgpostform);
+		      &cgipostform &yarrgpostform &cgi_get_caller);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
@@ -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>) {
@@ -214,12 +214,15 @@ sub parse_pctb_commodmap () {
 sub get_our_version ($$) {
     my ($aref,$prefix) = @_;
     $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
-    $aref->{"${prefix}fixes"}= 'lastpage';
+    $aref->{"${prefix}fixes"}= 'lastpage checkpager';
 
-    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;
+    # clientname	"ypp-sc-tools"
+    # clientversion	2.1-g2e06a26  [from git-describe --tags HEAD]
+    # clientfixes	"lastpage"  [space separated list]
 }
 
 sub pipethrough_prep () {
@@ -299,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();
     }
 }