summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki.pm4
-rw-r--r--debian/changelog4
2 files changed, 6 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7084e9627..80208ef2b 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -264,6 +264,7 @@ sub writefile ($$$;$) { #{{{
close OUT;
} #}}}
+my %cleared;
sub will_render ($$;$) { #{{{
my $page=shift;
my $dest=shift;
@@ -275,11 +276,12 @@ sub will_render ($$;$) { #{{{
error("$config{destdir}/$dest independently created, not overwriting with version from $page");
}
- if (! $clear) {
+ if (! $clear || $cleared{$page}) {
$renderedfiles{$page}=[$dest, grep { $_ ne $dest } @{$renderedfiles{$page}}];
}
else {
$renderedfiles{$page}=[$dest];
+ $cleared{$page}=1;
}
} #}}}
diff --git a/debian/changelog b/debian/changelog
index 4912a7b26..690b4a971 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ ikiwiki (1.30) UNRELEASED; urgency=low
plugin, but featuring a more ikiwiki-ish syntax and with shortcuts that
can be configured using a page in wiki.
* Fix support for --pingurl at the command line.
+ * Fix a subtle bug in will_render that broke some builds, by only clearing
+ items from renderedfiles the first time per build.
- -- Joey Hess <joeyh@debian.org> Mon, 16 Oct 2006 14:32:56 -0400
+ -- Joey Hess <joeyh@debian.org> Mon, 16 Oct 2006 14:50:13 -0400
ikiwiki (1.29) unstable; urgency=low