From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 24 Oct 2008 19:02:54 +0000 (-0400)
Subject: can't lock wiki due to permissions (probably)
X-Git-Tag: 2.68~92
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/739e2ca0b442531b3f0e1b83c3338d2da65ca77d?ds=sidebyside;hp=--cc

can't lock wiki due to permissions (probably)

luckily, don't really need to here
---

739e2ca0b442531b3f0e1b83c3338d2da65ca77d
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 9a672abc9..81b67d9b4 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -33,7 +33,8 @@ sub test () { #{{{
 	$session->param("name", getuser());
 	$ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
 
-	IkiWiki::lockwiki();
+	# Wiki is not locked because we lack permission to do so.
+	# So, relying on atomic index file updates to avoid trouble.
 	IkiWiki::loadindex();
 
 	my %newfiles;
@@ -59,8 +60,8 @@ sub test () { #{{{
 		    $change->{action} eq 'add') {
 			if (defined $page) {
 				if (IkiWiki->can("check_canedit")) {
-				    IkiWiki::check_canedit($page, $cgi, $session);
-				    next;
+					IkiWiki::check_canedit($page, $cgi, $session);
+					next;
 				}
 			}
 			else {