From: Chris Lamb <lamby@debian.org>
Date: Sat, 31 Oct 2009 09:16:20 +0000 (+0000)
Subject: Rename warning/error in lintian autorejects to nonfatal/fatal.
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=ba4056eaffdde2acaf8c6281cf8ba4b3e1da2bd5

Rename warning/error in lintian autorejects to nonfatal/fatal.

Signed-off-by: Chris Lamb <lamby@debian.org>
---

diff --git a/config/debian/lintian.tags b/config/debian/lintian.tags
index bf489144..e736be35 100644
--- a/config/debian/lintian.tags
+++ b/config/debian/lintian.tags
@@ -1,5 +1,5 @@
 lintian:
-  warning:
+  nonfatal:
     - statically-linked-binary
     - arch-independent-package-contains-binary-or-object
     - arch-dependent-file-in-usr-share
@@ -12,7 +12,7 @@ lintian:
     - mknod-in-maintainer-script
     - package-contains-info-dir-file
     - copyright-lists-upstream-authors-with-dh_make-boilerplate
-  error:
+  fatal:
     - wrong-file-owner-uid-or-gid
     - bad-relation
     - FSSTND-dir-in-usr
diff --git a/daklib/queue.py b/daklib/queue.py
index 95268527..6325fde6 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1336,11 +1336,11 @@ class Upload(object):
 
             if etype == 'O':
                 # We know it and it is overriden. Check that override is allowed.
-                if etag in lintiantags['warning']:
+                if etag in lintiantags['nonfatal']:
                     # The tag is overriden, and it is allowed to be overriden.
                     # Don't add a reject message.
                     pass
-                elif etag in lintiantags['error']:
+                elif etag in lintiantags['fatal']:
                     # The tag is overriden - but is not allowed to be
                     self.rejects.append("%s: Overriden tag %s found, but this tag may not be overwritten." % (epackage, etag))
                     log("ftpmaster does not allow tag to be overridable", etag)
@@ -1348,7 +1348,7 @@ class Upload(object):
                 # Tag is known, it is not overriden, direct reject.
                 self.rejects.append("%s: Found lintian output: '%s %s', automatically rejected package." % (epackage, etag, etext))
                 # Now tell if they *might* override it.
-                if etag in lintiantags['warning']:
+                if etag in lintiantags['nonfatal']:
                     log("auto rejecting", "overridable", etag)
                     self.rejects.append("%s: If you have a good reason, you may override this lintian tag." % (epackage))
                 else: