fix
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Fri, 17 Mar 2006 18:44:14 +0000 (18:44 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Fri, 17 Mar 2006 18:44:14 +0000 (18:44 +0000)
ikiwiki

diff --git a/ikiwiki b/ikiwiki
index f918980dd49a650a98d314b5ecd20f6e351f370b..e218979d1068ecfebfe0b6134a8b921fe788c688 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -420,7 +420,7 @@ sub lockwiki () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 
-sub lockwiki () { #{{{
+sub unlockwiki () { #{{{
        close WIKILOCK;
 } #}}}
 
        close WIKILOCK;
 } #}}}
 
@@ -1134,7 +1134,8 @@ sub cgi_editpage ($$) { #{{{
                        # presumably the commit will trigger an update
                        # of the wiki
                        rcs_commit($message);
                        # presumably the commit will trigger an update
                        # of the wiki
                        rcs_commit($message);
-                       unlock_wiki();
+                       # prevent deadlock with post-commit hook
+                       unlockwiki();
                }
                else {
                        loadindex();
                }
                else {
                        loadindex();