diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-16 17:32:30 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-16 17:32:30 +0000 |
| commit | df30eda283e4fdb6945508e17ca48ae21528596c (patch) | |
| tree | 7bceb992a97d978032bcc466cb6b77a6449ca98a | |
| parent | 6e5ae610e4eb31f983def35fd8d4cffb48fe4b1f (diff) | |
| download | ikiwiki-df30eda283e4fdb6945508e17ca48ae21528596c.tar ikiwiki-df30eda283e4fdb6945508e17ca48ae21528596c.tar.gz | |
* Add some locking to prevent 2 aggregators from running at once.
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 2e4026757..23428cb0e 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -35,11 +35,13 @@ sub getopt () { #{{{ } #}}} sub checkconfig () { #{{{ - loadstate(); if ($IkiWiki::config{aggregate}) { + IkiWiki::lockwiki(); + loadstate(); IkiWiki::loadindex(); aggregate(); savestate(); + IkiWiki::unlockwiki(); } } #}}} diff --git a/debian/changelog b/debian/changelog index 70a598599..e89a57cb1 100644 --- 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. + * 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 |