use prune to delete rendered files

[ikiwiki.git] / IkiWiki / Plugin / aggregate.pm

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 2fcdec9e73d71ad303ff4f807d8f81a9bcc58248..301fe40f6dcb96ba15cc396ee823ea5509ac7378 100644 (file)
--- 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,11 @@ sub migrate_to_internal { #{{{
                else {
                        debug("$oldname not found");
                }
+               if (-e $oldoutput) {
+                       use IkiWiki::Render;
+                       debug("removing output file $oldoutput");
+                       IkiWIki::prune($oldoutput) || error ("$!");
+               }
        }
        
        savestate();