* Fix a subtle bug in will_render that broke some builds, by only clearing

  items from renderedfiles the first time per build.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7084e9627aa5258d3f3f9bc34d3b82f867d89c3e..80208ef2b51878bb20e9321b36a9094c8ee8b17d 100644 (file)
--- 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 4912a7b269e9c24816851b40791a6bb21cfb0220..690b4a9710ed9ba254cabe73bf79d714ecb66339 100644 (file)
--- 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