From cb4b99929757f970d5ae697f0d09514ad624ed46 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 17 Jun 2010 16:54:03 -0400
Subject: avoid dying if cannot chdir to an underlaydir

---
 IkiWiki/Render.pm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'IkiWiki/Render.pm')

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c6167b437..aae1f90b0 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -335,21 +335,22 @@ sub find_src_files () {
 		}
 	};
 
-	chdir($config{srcdir}) || die "chdir: $!";
+	chdir($config{srcdir}) || die "chdir $config{srcdir}: $!";
 	find({
 		no_chdir => 1,
 		wanted => $helper,
 	}, '.');
-	chdir($origdir) || die "chdir: $!";
+	chdir($origdir) || die "chdir $origdir: $!";
 
 	$underlay=1;
 	foreach (@{$config{underlaydirs}}, $config{underlaydir}) {
-		chdir($_) || die "chdir: $!";
-		find({
-			no_chdir => 1,
-			wanted => $helper,
-		}, '.');
-		chdir($origdir) || die "chdir: $!";
+		if (chdir($_)) {
+			find({
+				no_chdir => 1,
+				wanted => $helper,
+			}, '.');
+			chdir($origdir) || die "chdir: $!";
+		}
 	};
 
 	return \@files, \%pages;
-- 
cgit v1.2.3