From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 13 Jul 2008 00:21:42 +0000 (-0400)
Subject: convert fatal error to warning
X-Git-Tag: 2.54~70^2~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4e3d7e2d4195bcd22c467522719c9c6dd39216b;p=ikiwiki.git

convert fatal error to warning

Since perlmagick is not a hard dep, and goodstuff is enabled by default,
imgs should not crash builds
---

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index cc0e84b01..49e1d57d6 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -46,7 +46,7 @@ sub preprocess (@) { #{{{
 	my $base = IkiWiki::basename($file);
 
 	eval q{use Image::Magick};
-	error($@) if $@;
+	return "[[img ".gettext("Image::Magick not installed")."]]" if $@;
 	my $im = Image::Magick->new;
 	my $imglink;
 	my $r;