po: Check that translated underlay directories exist before using them for master...

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 2250a7f9f309cf55d14991a17e4809af82e7eebf..00c58fbe54f4992dd802496157ecd267a2ac30bf 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -174,7 +174,9 @@ sub checkconfig () {
                if ($config{po_master_language}{code} ne 'en') {
                        # Add underlay containing translated source files
                        # for the master language.
-                       add_underlay("locale/$config{po_master_language}{code}/$underlay");
+print STDERR "added underlay locale/$config{po_master_language}{code}/$underlay\n";
+                       add_underlay("locale/$config{po_master_language}{code}/$underlay")
+                               if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay";
                }
        }
 }

diff --git a/debian/changelog b/debian/changelog
index e14cc91f56aeb540ffc6ceddbb6b6957c79f5a2a..e985a5da8abf9b434c150a721fd3b2107cc68650 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ ikiwiki (3.20100406) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * Update dependency for git-core to git transition.
+  * po: Check that translated underlay directories exist before using them
+    for master language.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400