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

Ken Manheimer klm@zope.com
Tue, 9 Jul 2002 14:07:43 -0400

Update of /cvs-zopeorg/CVSROOT
In directory cvs.zope.org:/tmp/cvs-serv19264

Modified Files:
Log Message:
create_diff(): We were trimming too many leading lines from the diff
reports, probably a holdover from the switch to using unified diff.
Tres noticed the problem, *and* tracked it down - thanks!

=== CVSROOT/postcommit_actions 1.6 => 1.7 ===
-"""Apply actions triggered by checkins as dictated by traffic_table.py.
+"""Apply checkin actions dictated by traffic_table.py, as checkins occur.
 Special provisions to fork into the background, disconnected from tty, so
-the user and (more critically) CVS locks don't wait pending completion of
-notification and other potentially meandering actions.
+the user and (more critically) CVS locks aren't held just pending completion 
+of notification and other potentially meandering actions.
@@ -348,7 +348,7 @@
         diff_cmd = ('cvs -d %s -f rdiff -r %s -r %s -kk -u %s/%s'
                     % (CVSROOT, old, new, repo, file))
         file_handle = os.popen(diff_cmd)
-        lines = file_handle.readlines()[6:]
+        lines = file_handle.readlines()[5:]
         header = ("=== %s/%s %s => %s ==="
                   % (str(repo), str(file), old, new))