diff options
author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-02-21 08:55:28 +0000 |
---|---|---|
committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-02-21 08:55:28 +0000 |
commit | c60477228c6b4d5e00c7bdb3b895e9f30d00ea97 (patch) | |
tree | 03b0c2eceadcc57a732eca6a054dff92fbd4eb56 /ikiwiki.in | |
parent | 24b83435061f94c6e203ed1b31b114b53ab8b8a3 (diff) | |
download | ikiwiki-c60477228c6b4d5e00c7bdb3b895e9f30d00ea97.tar ikiwiki-c60477228c6b4d5e00c7bdb3b895e9f30d00ea97.tar.gz |
* Since the CGI had to drop the wiki lock to avoid deadlocking the
commit hook, it was possible for one CGI to race another one and "win"
the commit of both their files. This race has been fixed by adding a new
commitlock, which when locked by the CGI, disables the commit hook
(except for commit mails). The CGI then takes care of the updates the
commit hook would have done.
Diffstat (limited to 'ikiwiki.in')
-rwxr-xr-x | ikiwiki.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ikiwiki.in b/ikiwiki.in index 24b02bc41..5dd1064f9 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -117,6 +117,12 @@ sub main () { #{{{ require IkiWiki::Render; commandline_render(); } + elsif ($config{post_commit} && ! commit_hook_enabled()) { + if ($config{notify}) { + loadindex(); + rcs_notify(); + } + } else { lockwiki(); loadindex(); |