Improve error message if external plugin fails to load. Closes: #498458

master
Joey Hess 2008-09-11 01:41:55 -04:00
parent 20ad20a87b
commit a87cfbcb8d
2 changed files with 6 additions and 1 deletions

View File

@ -520,7 +520,11 @@ sub loadplugin ($) { #{{{
foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
"$installdir/lib/ikiwiki") {
if (defined $dir && -x "$dir/plugins/$plugin") {
require IkiWiki::Plugin::external;
eval { require IkiWiki::Plugin::external };
if ($@) {
my $reason=$@;
error(sprintf(gettext("failed to load external plugin needed for %s plugin: %s"), $plugin, $reason));
}
import IkiWiki::Plugin::external "$dir/plugins/$plugin";
$loaded_plugins{$plugin}=1;
return 1;

1
debian/changelog vendored
View File

@ -10,6 +10,7 @@ ikiwiki (2.64) UNRELEASED; urgency=low
external dependency and is not commonly used. If you use otl, make sure
you explicitly enable it now.
* goodstuff: Add more, progress, and table plugins to the bundle.
* Improve error message if external plugin fails to load. Closes: #498458
-- Joey Hess <joeyh@debian.org> Mon, 08 Sep 2008 19:21:20 -0400