From 35b69392c823a064023165d9a3ab6b7568ec1568 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Sep 2011 13:21:56 -0400 Subject: [PATCH] Avoid warning message when generating setup file if highlight is not installed. Closes: #637606 There's a nice message if the plugin is loaded and used and highlight is not available, and a nice fallback. So no need for this other warning, which can happen any time all plugins are loaded to generate a setup file. --- IkiWiki/Plugin/highlight.pm | 5 ----- debian/changelog | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 65e372db1..33d136fbf 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -51,12 +51,7 @@ sub getsetup () { } sub checkconfig () { - eval q{use highlight}; - if ($@) { - print STDERR "Failed to load highlight. Configuring anyway.\n"; - }; - if (highlight::DataDir->can('new')){ $data_dir=new highlight::DataDir(); $data_dir->searchDataDir(""); diff --git a/debian/changelog b/debian/changelog index 9444de7cb..762e1d19f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low the inlining page. * Fix comments testsuite to not rely on Date::Parse's ability to parse the date Columbus discovered America. Closes: #640350 + * Avoid warning message when generating setup file if highlight + is not installed. Closes: #637606 -- Joey Hess Tue, 19 Jul 2011 11:22:52 -0400