X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2FCommods.pm;h=c82fdfdbb156a0c3daebd1f4ce6d7e4fe0f36f83;hp=0f7ebd63a253919301b58c90855c42284c5295f7;hb=608bc9e07b5c8a961325fd1b8d5b92f65418b949;hpb=e58353c2740e8c35e3ce04397d60009989c2f16e diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm index 0f7ebd6..c82fdfd 100644 --- a/yarrg/Commods.pm +++ b/yarrg/Commods.pm @@ -198,7 +198,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>) { @@ -217,7 +217,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; @@ -303,7 +303,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(); } }