summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-14 19:43:45 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-14 19:43:45 -0400
commit51bf0ea529c0b336ee04e54c5f2053f3ff7f00b0 (patch)
tree1c243299b525138956c94e9a3dbc87597fe73bff
parent50a5ab3c4e1db5beb18d86873143e7715fd5b27e (diff)
changes to debug message printing
-rw-r--r--IkiWiki/Plugin/aggregate.pm23
1 files changed, 11 insertions, 12 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 9da619375..1f09c988b 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -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();
} #}}}