Merge commit 'smcv/aggregateinternal' into aggregateinternal

Conflicts:

	doc/plugins/aggregate.mdwn

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();