X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/df30eda283e4fdb6945508e17ca48ae21528596c..f7f3b0bb7d91c74f67023e970cee71ad2ea260da:/IkiWiki/Plugin/aggregate.pm

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 23428cb0e..d0d7f4217 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -35,14 +35,14 @@ sub getopt () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{
+	IkiWiki::lockwiki();
+	loadstate();
 	if ($IkiWiki::config{aggregate}) {
-		IkiWiki::lockwiki();
-		loadstate();
 		IkiWiki::loadindex();
 		aggregate();
 		savestate();
-		IkiWiki::unlockwiki();
 	}
+	IkiWiki::unlockwiki();
 } #}}}
 
 sub filter (@) { #{{{
@@ -232,7 +232,8 @@ sub aggregate () { #{{{
 			);
 		}
 
-		$feed->{message}="processed ok";
+		$feed->{message}="processed ok at ".
+			IkiWiki::displaytime($feed->{lastupdate});
 	}
 
 	# TODO: expiry
@@ -267,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++
 		}
@@ -323,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;