* Fix a bug in the aggregator introduced last version that caused all
aggregator state to be lost during a non-aggregating build.master
parent
480a49af47
commit
9556c4a889
|
@ -35,14 +35,14 @@ sub getopt () { #{{{
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
sub checkconfig () { #{{{
|
sub checkconfig () { #{{{
|
||||||
if ($IkiWiki::config{aggregate}) {
|
|
||||||
IkiWiki::lockwiki();
|
IkiWiki::lockwiki();
|
||||||
loadstate();
|
loadstate();
|
||||||
|
if ($IkiWiki::config{aggregate}) {
|
||||||
IkiWiki::loadindex();
|
IkiWiki::loadindex();
|
||||||
aggregate();
|
aggregate();
|
||||||
savestate();
|
savestate();
|
||||||
IkiWiki::unlockwiki();
|
|
||||||
}
|
}
|
||||||
|
IkiWiki::unlockwiki();
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
sub filter (@) { #{{{
|
sub filter (@) { #{{{
|
||||||
|
|
|
@ -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.
|
* Relicense the templates and basewiki under the 2-clause BSD license.
|
||||||
Since these can easily become part of other people's websites, they
|
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.
|
* Add --syslog config option, to log to the syslog.
|
||||||
* Catch failing IPC::Open2 in tidy plugin and retry in case this is a
|
* 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).
|
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
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue