diff options
| author | Joey Hess <joeyh@joeyh.name> | 2014-12-30 15:51:50 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-30 15:51:50 -0400 |
| commit | f88e109bec4df70875a72f5044b8940eefbdd26e (patch) | |
| tree | 3970bb1b962c37868d564118798b3354f8651f36 | |
| parent | 8a98440db6454fc8653c264f61502bd0d1d6baf8 (diff) | |
| download | ikiwiki-f88e109bec4df70875a72f5044b8940eefbdd26e.tar ikiwiki-f88e109bec4df70875a72f5044b8940eefbdd26e.tar.gz | |
po: If msgmerge falls over on a problem po file, print a warning message, but don't let this problem crash ikiwiki entirely.
| -rw-r--r-- | IkiWiki/Plugin/po.pm | 7 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 6107a4a22..6b55ee351 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -993,10 +993,9 @@ sub refreshpofiles ($@) { } if (-e $pofile) { - system("msgmerge", "--previous", "-q", "-U", "--backup=none", $pofile, $potfile) == 0 - or error("po(refreshpofiles) ". - sprintf(gettext("failed to update %s"), - $pofile)); + if (! (system("msgmerge", "--previous", "-q", "-U", "--backup=none", $pofile, $potfile) == 0)) { + print STDERR ("po(refreshpofiles) ". sprintf(gettext("failed to update %s"), $pofile)); + } } else { File::Copy::syscopy($potfile,$pofile) diff --git a/debian/changelog b/debian/changelog index 2a3f729c5..b8a74935f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,10 @@ ikiwiki (3.20141017) UNRELEASED; urgency=medium * build: in po/Makefile, use the same $(MAKE) as the rest of the build. Thanks, ttw + [ Joey Hess ] + * po: If msgmerge falls over on a problem po file, print a warning + message, but don't let this problem crash ikiwiki entirely. + -- Joey Hess <joeyh@debian.org> Mon, 20 Oct 2014 12:04:49 -0400 ikiwiki (3.20141016) unstable; urgency=medium |