From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Thu, 10 Aug 2006 03:03:34 +0000 (+0000)
Subject: * Display an error message if /usr/bin/markdown can't be loaded.
X-Git-Tag: 1.17~14
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/119e3e209dc2be25920d89e470a1e8d7b5d98f7b

* Display an error message if /usr/bin/markdown can't be loaded.
---

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index a344de067..c1f978ad3 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -19,7 +19,7 @@ sub htmlize ($) { #{{{
 		no warnings 'once';
 		$blosxom::version="is a proper perl module too much to ask?";
 		use warnings 'all';
-		do "/usr/bin/markdown";
+		do "/usr/bin/markdown" || IkiWiki::error("failed to load /usr/bin/markdown: $!");
 		require Encode;
 	}
 	
diff --git a/debian/changelog b/debian/changelog
index 8fc3b66db..c89500109 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ ikiwiki (1.17) UNRELEASED; urgency=low
   * Remove <br> from end of aggregate preprocessor directive output.
   * Ship ikiwiki executable as ikiwiki.pl in source to avoid issues on
     case-sensative filesystems like OSX.
+  * Display an error message if /usr/bin/markdown can't be loaded.
 
- -- Joey Hess <joeyh@debian.org>  Tue,  8 Aug 2006 10:52:23 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed,  9 Aug 2006 23:01:02 -0400
 
 ikiwiki (1.16) unstable; urgency=low