From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 17 Mar 2006 18:34:33 +0000 (+0000)
Subject: unlock wiki during svn commit to prevent deadlock with post-commit hook
X-Git-Tag: 1.0~332
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7fca2e01f888ba211d46602ba56bee9faa7d150a;p=ikiwiki.git

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

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();