chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes from tests on harley, including horrid bodge for git-describe failure
[ypp-sc-tools.db-test.git]
/
yarrg
/
Commods.pm
diff --git
a/yarrg/Commods.pm
b/yarrg/Commods.pm
index 65cf4eb03ad381cfef565c8635728c7d3e457ec0..f81e1b8dff0863247ab3c8aca83aaab5ac32b23e 100644
(file)
--- 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
&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();
%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//; }
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,10
+216,13
@@
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;
+ # clientname "ypp-sc-tools"
+ # clientversion 2.1-g2e06a26 [from git-describe --tags HEAD]
+ # clientfixes "lastpage" [space separated list]
}
sub pipethrough_prep () {
}
sub pipethrough_prep () {
@@
-299,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();
}
}