Merge branch 'stable-3.x'

diff --combined yarrg/Commods.pm
index 0f7ebd63a253919301b58c90855c42284c5295f7,f81e1b8dff0863247ab3c8aca83aaab5ac32b23e..c82fdfdbb156a0c3daebd1f4ce6d7e4fe0f36f83
--- 1/yarrg/Commods.pm
--- 2/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@@ -41,8 -41,7 +41,8 @@@ BEGIN 
                      &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();
@@@ -198,7 -197,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 -216,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 -302,8 +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();
      }
  }
@@@ -357,8 -357,4 +358,8 @@@ sub cgi_get_caller () 
      return $caller;
  }
  
 +sub set_ctype_utf8 () {
 +    setlocale(LC_CTYPE, "en.UTF-8");
 +}
 +
  1;