Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak:
  PASS

diff --combined daklib/queue.py
index cbdf57a3429a65cbf8d1dede7371e88ea37eb758,7165f588af942c8d32d0c1cad86881629edec50c..4e5368770d52ff3565c34e7fe37469458155c7a0
--- 1/daklib/queue.py
--- 2/daklib/queue.py
+++ b/daklib/queue.py
@@@ -26,6 -26,7 +26,6 @@@ Queue utility functions for da
  
  ###############################################################################
  
 -import cPickle
  import errno
  import os
  import pg
@@@ -1069,7 -1070,7 +1069,7 @@@ class Upload(object)
          (result, output) = commands.getstatusoutput(cmd)
          if (result != 0):
              self.rejects.append("'dpkg-source -x' failed for %s [return code: %s]." % (dsc_filename, result))
 -            self.rejects.append(utils.prefix_multi_line_string(output, " [dpkg-source output:] "), "")
 +            self.rejects.append(utils.prefix_multi_line_string(output, " [dpkg-source output:] "))
              return
  
          if not cnf.Find("Dir::Queue::BTSVersionTrack"):
@@@ -1242,7 -1243,7 +1242,7 @@@
          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:] "), "")
 +            self.rejects.append(utils.prefix_multi_line_string(output, " [possible output:] "))
              return
  
          if len(output) == 0:
@@@ -1270,6 -1271,7 +1270,7 @@@
                  if etag in lintiantags['warning']:
                      # The tag is overriden, and it is allowed to be overriden.
                      # Don't add a reject message.
+                     pass
                  elif etag in lintiantags['error']:
                      # 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))