[Buildbot-commits] [SPAM] Re: [Buildbot] #728: Perforce version 2009.1 introduces a new type of operation that breaks P4Poller: move/delete
Buildbot
buildbot-devel at lists.sourceforge.net
Fri Feb 26 17:11:38 UTC 2010
#728: Perforce version 2009.1 introduces a new type of operation that breaks
P4Poller: move/delete
--------------------------+-------------------------------------------------
Reporter: DouglasLeeder | Owner:
Type: defect | Status: new
Priority: major | Milestone: 0.8.0
Version: 0.7.11 | Keywords:
--------------------------+-------------------------------------------------
Changes (by dustin):
* milestone: undecided => 0.8.0
Old description:
> Perforce version 2009.1 introduces a new type of operation that breaks
> P4Poller: move/delete
>
> This causes traceback of the form:
>
> 2010/01/21 03:40 +0100 [-] P4 poll failed: [Failure instance: Traceback:
> <type 'exceptions.AssertionError'>: Invalid file line: '...
> //depot/CoreProducts/Tests/dev/maintenance/conan/conan_module_tests/.p4ignore#2
> move/delete'
> /usr/lib/python2.5/site-
> packages/twisted/internet/defer.py:304:_startRunCallbacks
>
> /usr/lib/python2.5/site-
> packages/twisted/internet/defer.py:317:_runCallbacks
>
> /usr/lib/python2.5/site-packages/twisted/internet/defer.py:281:_continue
>
> /usr/lib/python2.5/site-packages/twisted/internet/defer.py:277:unpause
> --- <exception caught here> ---
>
> /usr/lib/python2.5/site-
> packages/twisted/internet/defer.py:317:_runCallbacks
>
> /usr/lib/python2.5/site-
> packages/buildbot/changes/p4poller.py:188:_process_describe
> ]
>
> in the twisted.log files.
>
> I believe the following patch should fix it:
>
> --- a/buildbot/changes/p4poller.py
> +++ b/buildbot/changes/p4poller.py
> @@ -34,7 +34,7 @@ class P4Source(base.ChangeSource,
> util.ComparableMixin):
> r"Change (?P<num>\d+) on \S+ by \S+@\S+ '.+'$")
> describe_header_re = re.compile(
> r"Change \d+ by (?P<who>\S+)@\S+ on (?P<when>.+)$")
> - file_re = re.compile(r"^\.\.\. (?P<path>[^#]+)#\d+ \w+$")
> + file_re = re.compile(r"^\.\.\. (?P<path>[^#]+)#\d+ [/\w]+$")
> datefmt = '%Y/%m/%d %H:%M:%S'
>
> parent = None # filled in when we're added
New description:
Perforce version 2009.1 introduces a new type of operation that breaks
P4Poller: move/delete
This causes traceback of the form:
{{{
2010/01/21 03:40 +0100 [-] P4 poll failed: [Failure instance: Traceback:
<type 'exceptions.AssertionError'>: Invalid file line: '...
//depot/CoreProducts/Tests/dev/maintenance/conan/conan_module_tests/.p4ignore#2
move/delete'
/usr/lib/python2.5/site-
packages/twisted/internet/defer.py:304:_startRunCallbacks
/usr/lib/python2.5/site-
packages/twisted/internet/defer.py:317:_runCallbacks
/usr/lib/python2.5/site-packages/twisted/internet/defer.py:281:_continue
/usr/lib/python2.5/site-packages/twisted/internet/defer.py:277:unpause
--- <exception caught here> ---
/usr/lib/python2.5/site-
packages/twisted/internet/defer.py:317:_runCallbacks
/usr/lib/python2.5/site-
packages/buildbot/changes/p4poller.py:188:_process_describe
]
}}}
in the twisted.log files.
I believe the following patch should fix it:
{{{
#!patch
--- a/buildbot/changes/p4poller.py
+++ b/buildbot/changes/p4poller.py
@@ -34,7 +34,7 @@ class P4Source(base.ChangeSource, util.ComparableMixin):
r"Change (?P<num>\d+) on \S+ by \S+@\S+ '.+'$")
describe_header_re = re.compile(
r"Change \d+ by (?P<who>\S+)@\S+ on (?P<when>.+)$")
- file_re = re.compile(r"^\.\.\. (?P<path>[^#]+)#\d+ \w+$")
+ file_re = re.compile(r"^\.\.\. (?P<path>[^#]+)#\d+ [/\w]+$")
datefmt = '%Y/%m/%d %H:%M:%S'
parent = None # filled in when we're added
}}}
--
--
Ticket URL: <http://buildbot.net/trac/ticket/728#comment:3>
Buildbot <http://buildbot.net/>
Buildbot: build/test automation
More information about the Commits
mailing list