From 91ec7b17208d7aa58408ad765231e2b62337f232 Mon Sep 17 00:00:00 2001 From: "http://schmonz.livejournal.com/" Date: Sun, 2 Aug 2009 14:36:56 -0400 Subject: [PATCH] new CVS locking weirdness and workaround --- doc/post-commit/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/post-commit/discussion.mdwn b/doc/post-commit/discussion.mdwn index 6ae0d9bcb..c78709e94 100644 --- a/doc/post-commit/discussion.mdwn +++ b/doc/post-commit/discussion.mdwn @@ -116,3 +116,8 @@ Can you offer an educated guess what's going wrong here? --[[Schmonz]] >> process, so you could just use a temporary list of things to add. >> --[[Joey]] +>>> Thanks for the comments. Attempting to set up a wiki on a different system with a different version of `cvs`, I've encountered a new locking problem within CVS: `cvs commit` takes a write lock, post-commit ikiwiki calls `rcs_update()`, `cvs update` wants a read lock and blocks. The easiest fix I can think of is to make `cvs commit` return and relinquish its lock -- so instead of my wrapper script `exec`ing ikiwiki's post-commit hook, I amp it off and exit 0. Seems to do the trick and, if I grok ikiwiki's behavior here, is not dangerous. (Beats me why my development `cvs` doesn't behave the same WRT locking.) + +>>> I was all set to take your third suggestion, but now that there's more than one CVS oddity fixed trivially in a wrapper script, I think I prefer doing it that way. + +>>> I'd be glad for the CVS plugin to be included in ikiwiki, if and when you deem it ready. Please let me know what needs to be done for that to happen. --[[Schmonz]] -- 2.26.2