* Fix a subtle bug in will_render that broke some builds, by only clearing
items from renderedfiles the first time per build.master
parent
6aa477fe8b
commit
b02bbe8253
|
@ -264,6 +264,7 @@ sub writefile ($$$;$) { #{{{
|
||||||
close OUT;
|
close OUT;
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
|
my %cleared;
|
||||||
sub will_render ($$;$) { #{{{
|
sub will_render ($$;$) { #{{{
|
||||||
my $page=shift;
|
my $page=shift;
|
||||||
my $dest=shift;
|
my $dest=shift;
|
||||||
|
@ -275,11 +276,12 @@ sub will_render ($$;$) { #{{{
|
||||||
error("$config{destdir}/$dest independently created, not overwriting with version from $page");
|
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}}];
|
$renderedfiles{$page}=[$dest, grep { $_ ne $dest } @{$renderedfiles{$page}}];
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$renderedfiles{$page}=[$dest];
|
$renderedfiles{$page}=[$dest];
|
||||||
|
$cleared{$page}=1;
|
||||||
}
|
}
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,10 @@ ikiwiki (1.30) UNRELEASED; urgency=low
|
||||||
plugin, but featuring a more ikiwiki-ish syntax and with shortcuts that
|
plugin, but featuring a more ikiwiki-ish syntax and with shortcuts that
|
||||||
can be configured using a page in wiki.
|
can be configured using a page in wiki.
|
||||||
* Fix support for --pingurl at the command line.
|
* 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
|
ikiwiki (1.29) unstable; urgency=low
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue