po: If msgmerge falls over on a problem po file, print a warning message, but don...

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 6107a4a2252c256e715a3b0bd210eb28d45371b3..6b55ee35133e66a33f24710248b2afa666618189 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -993,10 +993,9 @@ sub refreshpofiles ($@) {
                }
 
                if (-e $pofile) {
                }
 
                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)
                }
                else {
                        File::Copy::syscopy($potfile,$pofile)

diff --git a/debian/changelog b/debian/changelog
index 2a3f729c57b785ebcf3269a45c4d8ee7e297d702..b8a74935fbaf3ab01aa3614aec8434578596c6f5 100644 (file)
--- 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
 
   * 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
  -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400
 
 ikiwiki (3.20141016) unstable; urgency=medium