don't show an error if the image is missing, instead, a broken link

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

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index e9349286300cc49a1d17287c1922f143841e4994..e000bc8648a39f33cea5aef932286255f343f4a2 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -120,46 +120,52 @@ sub htmlize (@) { #{{{
        return $params{content};
 } #}}}
 
+# Used by ikiwiki-transition aggregateinternal.
 sub migrate_to_internal { #{{{
-
        if (! lockaggregate()) {
-               error("an aggregation process is already running");
-               return;
+               error("an aggregation process is currently running");
        }
 
        IkiWiki::lockwiki();
        loadstate();
+       $config{verbose}=1;
 
        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});
-
-               print "I: $oldname -> $newname\n";
+               
+               debug "moving $oldname -> $newname";
                if (-e $newname) {
                        if (-e $oldname) {
                                error("$newname already exists");
                        }
                        else {
-                               print STDERR 
-                                       "W: already renamed to $newname?\n";
+                               debug("already renamed to $newname?");
                        }
                }
                elsif (-e $oldname) {
                        rename($oldname, $newname) || error("$!");
                }
                else {
-                       print "W: $oldname not found\n";
+                       debug("$oldname not found");
+               }
+               if (-e $oldoutput) {
+                       require IkiWiki::Render;
+                       debug("removing output file $oldoutput");
+                       IkiWiki::prune($oldoutput);
                }
        }
-
+       
        savestate();
        IkiWiki::unlockwiki;
-
+       
        unlockaggregate();
 } #}}}