chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.web-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.x'
[ypp-sc-tools.web-live.git]
/
yarrg
/
Commods.pm
diff --git
a/yarrg/Commods.pm
b/yarrg/Commods.pm
index b90e6d7bff2f27e25689d8b3be7e91be3b52e32b..c82fdfdbb156a0c3daebd1f4ce6d7e4fe0f36f83 100644
(file)
--- a/
yarrg/Commods.pm
+++ b/
yarrg/Commods.pm
@@
-41,7
+41,8
@@
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 &cgi_get_caller);
+ &cgipostform &yarrgpostform &cgi_get_caller
+ &set_ctype_utf8);
%EXPORT_TAGS = ( );
@EXPORT_OK = qw();
%EXPORT_TAGS = ( );
@EXPORT_OK = qw();
@@
-197,7
+198,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
+217,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
+303,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();
}
}
@@
-356,4
+358,8
@@
sub cgi_get_caller () {
return $caller;
}
return $caller;
}
+sub set_ctype_utf8 () {
+ setlocale(LC_CTYPE, "en.UTF-8");
+}
+
1;
1;