unlock wiki during svn commit to prevent deadlock with post-commit hook
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Fri, 17 Mar 2006 18:34:33 +0000 (18:34 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Fri, 17 Mar 2006 18:34:33 +0000 (18:34 +0000)
ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 40356f1d35426acd67e96d38a3fb69d9e65aa47c..f918980dd49a650a98d314b5ecd20f6e351f370b 100755 (executable)
--- 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();