changes to debug message printing
parent
50a5ab3c4e
commit
51bf0ea529
|
@ -113,15 +113,15 @@ 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};
|
||||
|
@ -132,21 +132,20 @@ sub migrate_to_internal { #{{{
|
|||
$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");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue