[Zope-CVS] CVS: CVSROOT - postcommit_actions:1.140

Ken Manheimer klm@zope.com
Thu, 15 Aug 2002 14:31:55 -0400


Update of /cvs-repository/CVSROOT
In directory cvs.zope.org:/tmp/cvs-serv5984

Modified Files:
	postcommit_actions 
Log Message:
Workaround for CVS rdiff bug using LockDir option and symlinks in the
cvs-repository path.  To avoid the bug, we use the absolute path for
the CVSROOT (stashed as CVSROOT_ABS).  (This is a preventative
measure, in case we ever do use a LockDir in the public CVSROOT.)


=== CVSROOT/postcommit_actions 1.139 => 1.140 ===
--- CVSROOT/postcommit_actions:1.139	Wed Aug  7 15:20:41 2002
+++ CVSROOT/postcommit_actions	Thu Aug 15 14:31:55 2002
@@ -53,6 +53,7 @@
 import socket, whrandom, getpass
 
 CVSROOT = os.path.split(SCRIPT_DIR)[0]
+CVSROOT_ABS = os.path.abspath('..')
 LDAP_PORT = 389
 LDAP_HOST = "10.0.11.6"
 OFFICIAL_SENDER = "cvs-admin@cvs.zope.org"
@@ -345,7 +346,7 @@
 
     else:                # A "normal" update happened
         diff_cmd = ('cvs -d %s -f rdiff -r %s -r %s -kk -u %s/%s'
-                    % (CVSROOT, old, new, repo, file))
+                    % (CVSROOT_ABS, old, new, repo, file))
         file_handle = os.popen(diff_cmd)
         lines = file_handle.readlines()[2:]
         file_handle.close()