[Buildbot-commits] buildbot CREDITS,1.3,1.4 ChangeLog,1.737,1.738

[Brian Warner]

Update of /cvsroot/buildbot/buildbot
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31473

Modified Files:
	CREDITS ChangeLog 
Log Message:
[project @ remove a stray ^M from the output of 'p4 describe', fixes SF#1555985]

Original author: warner at lothar.com
Date: 2006-09-17 20:48:47

Index: CREDITS
===================================================================
RCS file: /cvsroot/buildbot/buildbot/CREDITS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CREDITS	15 Sep 2006 14:49:52 -0000	1.3
+++ CREDITS	17 Sep 2006 20:49:31 -0000	1.4
@@ -42,3 +42,5 @@
 Philipp Frauenfelder
 James Knight
 Albert Hofkamp
+Brett Neely
+Wade Brainerd

Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.737
retrieving revision 1.738
diff -u -d -r1.737 -r1.738
--- ChangeLog	17 Sep 2006 20:43:39 -0000	1.737
+++ ChangeLog	17 Sep 2006 20:49:31 -0000	1.738
@@ -1,5 +1,10 @@
 2006-09-17  Brian Warner  <warner at lothar.com>
 
+	* buildbot/changes/p4poller.py (P4Source._process_describe): do an
+	rstrip() on the first line coming out of the 'p4 describe'
+	process, to remove the stray ^M that Wade Brainerd reports seeing
+	in the 'when' field. Fixes SF#1555985.
+
 	* buildbot/master.py (BuildMaster.loadConfig): improve the error
 	message logged when c['schedulers'] is not right
 	* buildbot/scheduler.py (Scheduler.__init__): improve error