diff options
| author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2010-08-13 11:21:11 +0200 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-08-13 17:58:21 -0400 |
| commit | df5de5b967a1e6e14161fd1269efe5b17d33eec1 (patch) | |
| tree | 4de148bb1bfda0812db7095cc2d3a63d89bf9bb8 /IkiWiki | |
| parent | 07e27bd082cf8ecd55908f6486a344bb74503de6 (diff) | |
| download | ikiwiki-df5de5b967a1e6e14161fd1269efe5b17d33eec1.tar ikiwiki-df5de5b967a1e6e14161fd1269efe5b17d33eec1.tar.gz | |
smiley: warn instead of error for missing smileys
A missing smileys.mdwn caused the plugin to error out interrupting the
building process. Instead, we check for the file presence and warn without
erroring out in case it's missing, in a similar fashion as it's
currently done for the shortcut plugin.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/smiley.pm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm index 0d77916d0..6f4f49d18 100644 --- a/IkiWiki/Plugin/smiley.pm +++ b/IkiWiki/Plugin/smiley.pm @@ -25,7 +25,14 @@ sub getsetup () { } sub build_regexp () { - my $list=readfile(srcfile("smileys.mdwn")); + my $srcfile = srcfile("smileys.mdwn", 1); + if (! defined $srcfile) { + print STDERR sprintf(gettext("smiley plugin will not work without %s"), + "smileys.mdwn")."\n"; + $smiley_regexp=''; + return; + } + my $list=readfile($srcfile); while ($list =~ m/^\s*\*\s+\\\\([^\s]+)\s+\[\[([^]]+)\]\]/mg) { my $smiley=$1; my $file=$2; |