diff options
| author | Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/> | 2008-07-15 03:24:05 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/> | 2008-07-15 03:24:05 +0100 |
| commit | b29d11b3c67533ca7addadb40a818a88cf6b8a84 (patch) | |
| tree | ab632ee5678e82d18d14b805384f0b1b108d9942 /IkiWiki | |
| parent | d3008b626ea6130d3b75662725f6f2c412fc71ea (diff) | |
| download | ikiwiki-b29d11b3c67533ca7addadb40a818a88cf6b8a84.tar ikiwiki-b29d11b3c67533ca7addadb40a818a88cf6b8a84.tar.gz | |
Fix aggregateinternal migration so it skips expired entries, and deletes output
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 2fcdec9e7..f648a3f99 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -132,9 +132,11 @@ sub migrate_to_internal { #{{{ foreach my $data (values %guids) { next unless $data->{page}; + next if $data->{expired}; $config{aggregateinternal} = 0; my $oldname = pagefile($data->{page}); + my $oldoutput = $config{destdir}."/".IkiWiki::htmlpage($data->{page}); $config{aggregateinternal} = 1; my $newname = pagefile($data->{page}); @@ -154,6 +156,10 @@ sub migrate_to_internal { #{{{ else { debug("$oldname not found"); } + if (-e $oldoutput) { + debug("removing output file $oldoutput"); + unlink($oldoutput) || error ("$!"); + } } savestate(); |