add postsparkline plugin, providing sparkliney stats goodness for blog

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

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index b1b069b006005f179216dfcf76e0cf0dfdbd5159..f353cb0ca83dd54e71f96ea030058f193bc822d3 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -31,15 +31,16 @@ sub getopt () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{
-       IkiWiki::lockwiki();
+       my $nolock=($config{post_commit} && ! IkiWiki::commit_hook_enabled());
+       IkiWiki::lockwiki() unless $nolock;
        loadstate();
-       if ($config{aggregate}) {
+       if ($config{aggregate} && ! $nolock) {
                IkiWiki::loadindex();
                aggregate();
                expire();
                savestate();
        }
-       IkiWiki::unlockwiki();
+       IkiWiki::unlockwiki() unless $nolock;
 } #}}}
 
 sub filter (@) { #{{{