unlock wiki during svn commit to prevent deadlock with post-commit hook
parent
2aa5962115
commit
7fca2e01f8
5
ikiwiki
5
ikiwiki
|
@ -420,6 +420,10 @@ sub lockwiki () { #{{{
|
||||||
}
|
}
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
|
sub lockwiki () { #{{{
|
||||||
|
close WIKILOCK;
|
||||||
|
} #}}}
|
||||||
|
|
||||||
sub loadindex () { #{{{
|
sub loadindex () { #{{{
|
||||||
open (IN, "$config{srcdir}/.ikiwiki/index") || return;
|
open (IN, "$config{srcdir}/.ikiwiki/index") || return;
|
||||||
while (<IN>) {
|
while (<IN>) {
|
||||||
|
@ -1130,6 +1134,7 @@ sub cgi_editpage ($$) { #{{{
|
||||||
# presumably the commit will trigger an update
|
# presumably the commit will trigger an update
|
||||||
# of the wiki
|
# of the wiki
|
||||||
rcs_commit($message);
|
rcs_commit($message);
|
||||||
|
unlock_wiki();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
loadindex();
|
loadindex();
|
||||||
|
|
Loading…
Reference in New Issue