From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 28 Oct 2009 09:16:19 +0000 (+0100)
Subject: Merge commit 'lamby/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=221d1da1403261ea11e408f8de879a39ef06810e;hp=a5d7d22121e018672da9dd74c89c046fb4dba1f9;p=dak.git

Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Fix lintian regex.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/daklib/regexes.py b/daklib/regexes.py
index cc5d1be6..6be99977 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 2f8fed1e..766e73e4 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__':