From: Chris Lamb <lamby@debian.org>
Date: Wed, 28 Oct 2009 09:25:43 +0000 (+0000)
Subject: If lintian returns 2 warn FTPMasters but try and continue anyway.
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=inline;h=a23e0192dccdd8b33005820667a659167306aa4a;p=dak.git

If lintian returns 2 warn FTPMasters but try and continue anyway.

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

diff --git a/daklib/queue.py b/daklib/queue.py
index 41c57335..c30aeb05 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1240,10 +1240,9 @@ class Upload(object):
         (result, output) = commands.getstatusoutput(command)
         # We are done with lintian, remove our tempfile
         os.unlink(temp_filename)
-        if (result != 0):
-            self.rejects.append("lintian failed for %s [return code: %s]." % (self.pkg.changes_file, result))
-            self.rejects.append(utils.prefix_multi_line_string(output, " [possible output:] "))
-            return
+        if (result == 2):
+            utils.warn("lintian failed for %s [return code: %s]." % (self.pkg.changes_file, result))
+            utils.warn(utils.prefix_multi_line_string(output, " [possible output:] "))
 
         if len(output) == 0:
             return