X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Flintian.py;h=3d1afc80966c35dfffce6218691a12364b976a74;hb=e54669f1fd985f194218658e9515038a073690e8;hp=260474ec50ce53d5b07bb8bddd60576bac60b382;hpb=17a0d1e7db664f4cdfd927b1aca9785ea06b9708;p=dak.git

diff --git a/daklib/lintian.py b/daklib/lintian.py
index 260474ec..3d1afc80 100644
--- a/daklib/lintian.py
+++ b/daklib/lintian.py
@@ -11,55 +11,48 @@ def parse_lintian_output(output):
     for line in output.split('\n'):
         m = re_parse_lintian.match(line)
         if m:
-            yield m.groups()
+            yield m.groupdict()
 
 def generate_reject_messages(parsed_tags, tag_definitions, log=lambda *args: args):
     """
     Generates package reject messages by comparing parsed lintian output with
-    tag definitions.
+    tag definitions. Returns a generator containing the reject messages.
     """
 
-    rejects = []
-
     tags = set()
     for values in tag_definitions.values():
-        for tag in values:
-            tags.add(tag)
+        for tag_name in values:
+            tags.add(tag_name)
+
+    for tag in parsed_tags:
+        tag_name = tag['tag']
 
-    for etype, epackage, etag, etext in parsed_tags:
-        if etag not in tags:
+        if tag_name not in tags:
             continue
 
         # Was tag overridden?
-        if etype == 'O':
+        if tag['level'] == 'O':
 
-            if etag in tag_definitions['nonfatal']:
+            if tag_name in tag_definitions['nonfatal']:
                 # Overriding this tag is allowed.
                 pass
 
-            elif etag in tag_definitions['fatal']:
+            elif tag_name in tag_definitions['fatal']:
                 # Overriding this tag is NOT allowed.
 
-                log('ftpmaster does not allow tag to be overridable', etag)
-                rejects.append(
-                    "%s: Overriden tag %s found, but this tag "
-                    "may not be overridden." % (epackage, etag)
-                )
+                log('ftpmaster does not allow tag to be overridable', tag_name)
+                yield "%(package)s: Overriden tag %(tag)s found, but this " \
+                    "tag may not be overridden." % tag
 
         else:
             # Tag is known and not overridden; reject
-            rejects.append(
-                "%s: Found lintian output: '%s %s', automatically "
-                "rejected package." % (epackage, etag, etext)
-            )
+            yield "%(package)s: lintian output: '%(tag)s %(description)s', " \
+                "automatically rejected package." % tag
 
             # Now tell if they *might* override it.
-            if etag in tag_definitions['nonfatal']:
-                log("auto rejecting", "overridable", etag)
-                rejects.append(
-                    "%s: If you have a good reason, you may override this "
-                    "lintian tag." % epackage)
+            if tag_name in tag_definitions['nonfatal']:
+                log("auto rejecting", "overridable", tag_name)
+                yield "%(package)s: If you have a good reason, you may " \
+                   "override this lintian tag." % tag
             else:
-                log("auto rejecting", "not overridable", etag)
-
-    return rejects
+                log("auto rejecting", "not overridable", tag_name)