changes to debug message printing

master
Joey Hess 2008-07-14 19:43:45 -04:00
parent 50a5ab3c4e
commit 51bf0ea529
1 changed files with 11 additions and 12 deletions

View File

@ -113,46 +113,45 @@ sub launchaggregation () { #{{{
return 1;
} #}}}
# 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();
} #}}}