[dak/master] Fix lintian regex.

[Chris Lamb <lamby@debian.org>]

Signed-off-by: Chris Lamb <lamby@debian.org>
---
 daklib/regexes.py     |    2 +-
 tests/test_regexes.py |   24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/daklib/regexes.py b/daklib/regexes.py
index cc5d1be..6be9997 100755
--- a/daklib/regexes.py
+++ b/daklib/regexes.py
@@ -112,4 +112,4 @@ re_user_mails = re.compile(r"^(pub|uid):[^rdin].*<(.*@.*)>.*$", re.MULTILINE);
 re_user_name = re.compile(r"^pub:.*:(.*)<.*$", re.MULTILINE);
 re_re_mark = re.compile(r'^RE:')
 
-re_parse_lintian = re.compile(r"^(W|E|O): (.*?): (.*?) (.*)$")
+re_parse_lintian = re.compile(r"^(W|E|O): (.*?): ([^ ]*) ?(.*)$")
diff --git a/tests/test_regexes.py b/tests/test_regexes.py
index 2f8fed1..766e73e 100755
--- a/tests/test_regexes.py
+++ b/tests/test_regexes.py
@@ -35,10 +35,28 @@ class re_single_line_field(unittest.TestCase):
 class re_parse_lintian(unittest.TestCase):
     MATCH = regexes.re_parse_lintian.match
 
-    def testSimple(self):
+    def testBinary(self):
+        self.assertEqual(
+            self.MATCH('W: pkgname: some-tag path/to/file').groups(),
+            ('W', 'pkgname', 'some-tag', 'path/to/file')
+        )
+
+    def testBinaryNoDescription(self):
+        self.assertEqual(
+            self.MATCH('W: pkgname: some-tag').groups(),
+            ('W', 'pkgname', 'some-tag', '')
+        )
+
+    def testSource(self):
+        self.assertEqual(
+            self.MATCH('W: pkgname source: some-tag').groups(),
+            ('W', 'pkgname source', 'some-tag', '')
+        )
+
+    def testSourceNoDescription(self):
         self.assertEqual(
-            self.MATCH('W: tzdata: binary-without-manpage usr/sbin/tzconfig').groups(),
-            ('W', 'tzdata', 'binary-without-manpage', 'usr/sbin/tzconfig')
+            self.MATCH('W: pkgname source: some-tag path/to/file').groups(),
+            ('W', 'pkgname source', 'some-tag', 'path/to/file')
         )
 
 if __name__ == '__main__':
-- 
1.6.3.3