diff options
Diffstat (limited to 'IkiWiki/Plugin/aggregate.pm')
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index e93492863..2fcdec9e7 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -120,46 +120,45 @@ 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}; - + $config{aggregateinternal} = 0; my $oldname = pagefile($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"); } } - + savestate(); IkiWiki::unlockwiki; - + unlockaggregate(); } #}}} |