changes to debug message printing

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 9da619375df515ec4e8d236d10ce7b7b5b2c2130..1f09c988b8ab8bdf05bd6ba2cad4bf787d904a42 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -113,46 +113,45 @@ sub launchaggregation () { #{{{
        return 1;
 } #}}}
 
        return 1;
 } #}}}
 

+# Used by ikiwiki-transition aggregateinternal.

 sub migrate_to_internal { #{{{
 sub migrate_to_internal { #{{{

-

        if (! lockaggregate()) {
        if (! lockaggregate()) {

-               error("an aggregation process is already running");
-               return;
+               error("an aggregation process is currently running");

        }
 
        IkiWiki::lockwiki();
        loadstate();
        }
 
        IkiWiki::lockwiki();
        loadstate();

+       $config{verbose}=1;

 
        foreach my $data (values %guids) {
                next unless $data->{page};
 
        foreach my $data (values %guids) {
                next unless $data->{page};

-
+               

                $config{aggregateinternal} = 0;
                my $oldname = pagefile($data->{page});
                $config{aggregateinternal} = 0;
                my $oldname = pagefile($data->{page});

-
+               

                $config{aggregateinternal} = 1;
                my $newname = 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 {
                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 {
                        }
                }
                elsif (-e $oldname) {
                        rename($oldname, $newname) || error("$!");
                }
                else {

-                       print "W: $oldname not found\n";
+                       debug("$oldname not found");

                }
        }
                }
        }

-
+       

        savestate();
        IkiWiki::unlockwiki;
        savestate();
        IkiWiki::unlockwiki;

-
+       

        unlockaggregate();
 } #}}}
 
        unlockaggregate();
 } #}}}