* Add some locking to prevent 2 aggregators from running at once.

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 2e4026757aba378dc878aa79788b335d43ad0d53..23428cb0e7a3d3e59d32931248ec3d97d9654e50 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -35,11 +35,13 @@ sub getopt () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{

-       loadstate();

        if ($IkiWiki::config{aggregate}) {
        if ($IkiWiki::config{aggregate}) {

+               IkiWiki::lockwiki();
+               loadstate();

                IkiWiki::loadindex();
                aggregate();
                savestate();
                IkiWiki::loadindex();
                aggregate();
                savestate();

+               IkiWiki::unlockwiki();

        }
 } #}}}
 
        }
 } #}}}
 

diff --git a/debian/changelog b/debian/changelog
index 70a598599f4b6c4ff8102f56c1b4e6762ae3193b..e89a57cb127d5c10f3962ece2a323c3377642390 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 ikiwiki (1.19) UNRELEASED; urgency=low
 
   * Fix several related bugs in page type determination during online editing.
 ikiwiki (1.19) UNRELEASED; urgency=low
 
   * Fix several related bugs in page type determination during online editing.

+  * Add some locking to prevent 2 aggregators from running at once.

 
 

- -- Joey Hess <joeyh@debian.org>  Sun, 13 Aug 2006 01:53:02 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 16 Aug 2006 13:28:34 -0400

 
 ikiwiki (1.18) unstable; urgency=low
 
 
 ikiwiki (1.18) unstable; urgency=low