summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-16 01:14:30 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-16 01:14:30 +0000
commit39fd60f1abcba33f3d793185cc0e31fb56441215 (patch)
tree13c9873bfe00d7a25e710d3f12c5798a2d5864f5
parent3b42bd84ca352082489d658cad7debd4b0ef2f8a (diff)
* Deal with CPAN installing Markdown as Text::Markdown, while it's
installed as just Markdown by apt.
-rw-r--r--IkiWiki/Plugin/mdwn.pm7
-rw-r--r--debian/changelog4
-rw-r--r--doc/bugs/markdown_module_location.mdwn6
3 files changed, 13 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index e5228c329..0fc077f5e 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -25,8 +25,11 @@ sub htmlize (@) { #{{{
eval q{use Markdown};
if ($@) {
- do "/usr/bin/markdown" ||
- error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
+ eval q{use Text::Markdown};
+ if ($@) {
+ do "/usr/bin/markdown" ||
+ error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
+ }
}
$markdown_loaded=1;
require Encode;
diff --git a/debian/changelog b/debian/changelog
index 5ed49c8e7..ee6fb6a85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,8 +36,10 @@ ikiwiki (1.27) UNRELEASED; urgency=low
* pagetemplate hooks are now also called when generating cgi pages.
* Add a favicon plugin, which simply adds a link tag for an icon to each
page (and cgis).
+ * Deal with CPAN installing Markdown as Text::Markdown, while it's
+ installed as just Markdown by apt.
- -- Joey Hess <joeyh@debian.org> Fri, 15 Sep 2006 19:39:36 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 15 Sep 2006 21:13:35 -0400
ikiwiki (1.26) unstable; urgency=low
diff --git a/doc/bugs/markdown_module_location.mdwn b/doc/bugs/markdown_module_location.mdwn
index 653468757..e72569f35 100644
--- a/doc/bugs/markdown_module_location.mdwn
+++ b/doc/bugs/markdown_module_location.mdwn
@@ -8,4 +8,8 @@ the Debian markdown, which I guess you can consider a blocking bug of this.
I tried to come up with the magical invocation to allow either location
to be used by ikiwiki, but I couldn't do it.
--- JamesWestby \ No newline at end of file
+-- JamesWestby
+
+Fixed, I think --[[Joey]]
+
+[[bugs/done]]