diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-17 23:09:55 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-17 23:09:55 +0000 |
| commit | 9556c4a889e3144f938f703d53b70a948dee8018 (patch) | |
| tree | ba6cd7fbe0f239f3607696a4b320be409c3e5af7 | |
| parent | 480a49af4755ae42d409ed351f99219cee846638 (diff) | |
* Fix a bug in the aggregator introduced last version that caused all
aggregator state to be lost during a non-aggregating build.
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 6c9958df8..33d7174f5 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 (@) { #{{{ diff --git a/debian/changelog b/debian/changelog index a302b9ecf..af03c72f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (1.20) UNRELEASED; urgency=low +ikiwiki (1.20) unstable; urgency=low * Relicense the templates and basewiki under the 2-clause BSD license. Since these can easily become part of other people's websites, they @@ -6,8 +6,10 @@ ikiwiki (1.20) UNRELEASED; urgency=low * Add --syslog config option, to log to the syslog. * Catch failing IPC::Open2 in tidy plugin and retry in case this is a transient failure to fork (which I've seen happen in the wild). + * Fix a bug in the aggregator introduced last version that caused all + aggregator state to be lost during a non-aggregating build. - -- Joey Hess <joeyh@debian.org> Thu, 17 Aug 2006 14:43:02 -0400 + -- Joey Hess <joeyh@debian.org> Thu, 17 Aug 2006 19:05:56 -0400 ikiwiki (1.19) unstable; urgency=low |