* Add processed date to aggregate preprocessor directive status output.

[ikiwiki.git] / IkiWiki / Plugin / aggregate.pm

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 2e4026757aba378dc878aa79788b335d43ad0d53..d0d7f421798d9dba9ada5107f6e2b58fd517b674 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -35,12 +35,14 @@ sub getopt () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{
+       IkiWiki::lockwiki();
        loadstate();
        if ($IkiWiki::config{aggregate}) {
                IkiWiki::loadindex();
                aggregate();
                savestate();
        }
+       IkiWiki::unlockwiki();
 } #}}}
 
 sub filter (@) { #{{{
@@ -230,7 +232,8 @@ sub aggregate () { #{{{
                        );
                }
 
-               $feed->{message}="processed ok";
+               $feed->{message}="processed ok at ".
+                       IkiWiki::displaytime($feed->{lastupdate});
        }
 
        # TODO: expiry
@@ -265,7 +268,7 @@ sub add_page (@) { #{{{
                        $page=$feed->{dir}."/item";
                }
                my $c="";
-               while (exists $IkiWiki::pagecase{lc $page} ||
+               while (exists $IkiWiki::pagecase{lc $page.$c} ||
                       -e pagefile($page.$c)) {
                        $c++
                }
@@ -321,7 +324,7 @@ sub htmlabs ($$) { #{{{
        # Convert links in html from relative to absolute.
        # Note that this is a heuristic, which is not specified by the rss
        # spec and may not be right for all feeds. Also, see Debian
-       # bug #XXXX TODO: get bug.
+       # bug #381359.
        my $html=shift;
        my $urlbase=shift;