From: Simon McVittie <smcv@debian.org>
Date: Tue, 9 Jun 2015 10:28:04 +0000 (+0100)
Subject: haiku: if deterministic build is requested, return a hard-coded haiku
X-Git-Tag: 3.20150610~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/361076e55d329c0297b2ddf450003ee7ce210925?ds=sidebyside

haiku: if deterministic build is requested, return a hard-coded haiku
---

diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index bf23dce67..7ce74696b 100644
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -25,7 +25,13 @@ sub preprocess (@) {
 
 	my $haiku;
 	eval q{use Coy};
-	if ($@ || ! Coy->can("Coy::with_haiku")) {
+	if ($config{deterministic}) {
+		$haiku = "Coy changes often.
+			  For deterministic builds
+			  try this substitute.
+			 ",
+	}
+	elsif ($@ || ! Coy->can("Coy::with_haiku")) {
 		my @canned=(
 			"The lack of a Coy:
 			 No darting, subtle haiku.
diff --git a/debian/changelog b/debian/changelog
index d359bf262..41a47e57f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ ikiwiki (3.20150330) UNRELEASED; urgency=medium
   * Sort backlinks deterministically, by falling back to sorting by href
     if the link text is identical
   * Add a $config{deterministic} option and use it for the docwiki
+  * haiku: if deterministic build is requested, return a hard-coded haiku
+  * If deterministic build is requested, return a hard-coded haiku
 
  -- Joey Hess <id@joeyh.name>  Tue, 28 Apr 2015 12:24:08 -0400