Allow a 'P' suffix from svnmerge, too

Fixes #2089.
buildbot · Sep 1, 2011 · 5fa6847 · 5fa6847
1 parent 3d12f87
commit 5fa6847
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/master/buildbot/steps/source/svn.py b/master/buildbot/steps/source/svn.py
@@ -256,7 +256,7 @@ def parseGotRevision(self, _):
         d = self.runCommand(cmd)
         def _setrev(res):
             output = self.getLog('stdio').readlines()[-1].strip()
-            revision = output.rstrip('MS')
+            revision = output.rstrip('MSP')
             revision = revision.split(':')[-1]
             try:
                 int(revision)

diff --git a/slave/buildslave/commands/svn.py b/slave/buildslave/commands/svn.py
@@ -195,7 +195,7 @@ def parseGotRevision(self):
         def _parse(res):
             r_raw = c.stdout.strip()
             # Extract revision from the version "number" string
-            r = r_raw.rstrip('MS')
+            r = r_raw.rstrip('MSP')
             r = r.split(':')[-1]
             got_version = None
             try: