* Fix a bug in the aggregator introduced last version that caused all

  aggregator state to be lost during a non-aggregating build.

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 6c9958df8c862249b1c663906e1ac06406f7fd17..33d7174f5367a394846462080bd0786840e33ad0 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -35,14 +35,14 @@ sub getopt () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{

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

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

-               IkiWiki::lockwiki();
-               loadstate();

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

-               IkiWiki::unlockwiki();

        }
        }

+       IkiWiki::unlockwiki();

 } #}}}
 
 sub filter (@) { #{{{
 } #}}}
 
 sub filter (@) { #{{{

diff --git a/debian/changelog b/debian/changelog
index a302b9ecf458db656656637efaeada53a9acd4fa..af03c72f584461cdf60d4f83024da705cc3133aa 100644 (file)
--- 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
 
   * 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).
   * 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
 
 
 ikiwiki (1.19) unstable; urgency=low