unlock wiki during svn commit to prevent deadlock with post-commit hook

1 files changed, 5 insertions, 0 deletions

diff --git a/ikiwiki b/ikiwiki
index 40356f1d3..f918980dd 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -420,6 +420,10 @@ sub lockwiki () { #{{{
 	}
 } #}}}
 
+sub lockwiki () { #{{{
+	close WIKILOCK;
+} #}}}
+
 sub loadindex () { #{{{
 	open (IN, "$config{srcdir}/.ikiwiki/index") || return;
 	while (<IN>) {
@@ -1130,6 +1134,7 @@ sub cgi_editpage ($$) { #{{{
 			# presumably the commit will trigger an update
 			# of the wiki
 			rcs_commit($message);
+			unlock_wiki();
 		}
 		else {
 			loadindex();