Rev 220: Made Script.star_re less restrictive. in http://bzr.daniel-watkins.co.uk/pqm/xmlrpc

[Daniel Watkins]

At http://bzr.daniel-watkins.co.uk/pqm/xmlrpc

------------------------------------------------------------
revno: 220
revision-id: daniel at daniel-watkins.co.uk-20080801030942-ccrjkptnez0vnv40
parent: daniel at daniel-watkins.co.uk-20080801030351-zztbqr5ezvkhda33
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: xmlrpc-validation
timestamp: Fri 2008-08-01 04:09:42 +0100
message:
  Made Script.star_re less restrictive.
-------------- next part --------------
=== modified file 'pqm/script.py'
--- a/pqm/script.py	2008-08-01 02:43:44 +0000
+++ b/pqm/script.py	2008-08-01 03:09:42 +0000
@@ -106,7 +106,7 @@
     pgp_re = re.compile('^-----BEGIN PGP.*MESSAGE')
     pgp_end_re = re.compile('^-----BEGIN PGP SIG')
     # parser for merge recognition
-    star_re = re.compile('^star-merge (\S+/\S+)\s+(\S+/\S+)\s*$')
+    star_re = re.compile('^star-merge (\S+)\s+(\S+)\s*$')
     # parse matcher for the debug command
     debug_re = re.compile('^debug')