Avoid warning message when generating setup file if highlight is not installed. Close...

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.

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 65e372db1336dbdedd6f1c5e256d4ef3b953aa2a..33d136fbf44c0277d2a540f77b9615bc2eb6ddcc 100644 (file)
--- 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 9444de7cbc238c17c433b5d0f1f194daf7a66360..762e1d19fd308244c2ac55d2a81fee980a1b3a60 100644 (file)
--- 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 <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400