diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2010-01-21 15:23:25 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2010-01-21 15:33:20 -0500 |
| commit | ee9ae0a3149f04e9373a0b7b1fece99f5cc78e9c (patch) | |
| tree | 8f3165e8727430f7a2feb6e58603f691d71b2763 | |
| parent | 8bf2f5a31ae3569b0c1c5b139640f7e8356a90f4 (diff) | |
po: avoid crash when page is empty
Note that there is an associated po4a warning when a page is empty:
Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/Locale/Po4a/Text.pm line 205.
I've filed a bug with po4a about that, but the important thing is fixing
the crash here.
| -rw-r--r-- | IkiWiki/Plugin/po.pm | 12 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 02fc4a89e..f8801185e 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -1057,11 +1057,8 @@ sub commit_and_refresh ($$) { IkiWiki::saveindex(); } -# on success, returns the filtered content. -# on error, if $nonfatal, warn and return undef; else, error out. -sub po_to_markup ($$;$) { +sub po_to_markup ($$) { my ($page, $content) = (shift, shift); - my $nonfatal = shift; $content = '' unless defined $content; $content = decode_utf8(encode_utf8($content)); @@ -1084,10 +1081,6 @@ sub po_to_markup ($$;$) { my $fail = sub ($) { my $msg = "po(po_to_markup) - $page : " . shift; - if ($nonfatal) { - warn $msg; - return undef; - } error($msg, sub { unlink $infile, $outfile}); }; @@ -1108,8 +1101,7 @@ sub po_to_markup ($$;$) { $doc->write($outfile) or return $fail->(sprintf(gettext("failed to write %s"), $outfile)); - $content = readfile($outfile) - or return $fail->(sprintf(gettext("failed to read %s"), $outfile)); + $content = readfile($outfile); # Unlinking should happen automatically, thanks to File::Temp, # but it does not work here, probably because of the way writefile() diff --git a/debian/changelog b/debian/changelog index 6fbbe0a23..91f5d7807 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low * git: The new git-notes feature in git 1.6.6 changes git log output in a way that broke ikiwiki's parser if notes are added to commits. Deal with this. + * po: Avoid crash when a page is empty. -- Joey Hess <joeyh@debian.org> Mon, 04 Jan 2010 12:53:24 -0500 |