[Buildbot-commits] buildbot/buildbot/changes p4poller.py,1.6,1.7

[Brian Warner]

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

Modified Files:
	p4poller.py 
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: p4poller.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/p4poller.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- p4poller.py	12 Jun 2006 08:36:08 -0000	1.6
+++ p4poller.py	17 Sep 2006 20:49:31 -0000	1.7
@@ -166,6 +166,9 @@
 
     def _process_describe(self, result, num):
         lines = result.split('\n')
+        # SF#1555985: Wade Brainerd reports a stray ^M at the end of the date
+        # field. The rstrip() is intended to remove that.
+        lines[0] = lines[0].rstrip()
         m = self.describe_header_re.match(lines[0])
         assert m, "Unexpected 'p4 describe -s' result: %r" % result
         who = m.group('who')