Merge commit 'lamby/master'

diff --combined daklib/queue.py
index a6b6e7fbb10654801876337125940ec5462e5702,cee15a5a451fbc9bc8f28464e29da0f8c542403f..b2ee5e3fe3fcbc950da01563b1724ed6feeab1d0
--- 1/daklib/queue.py
--- 2/daklib/queue.py
+++ b/daklib/queue.py
@@@ -1279,7 -1279,7 +1279,7 @@@ class Upload(object)
                  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']:
 -                    self.rejects.append("%s: If you have a good reason, you may override this lintian tag. Laziness to fix your crap is NOT A GOOD REASON, sod off" % (epackage))
 +                    self.rejects.append("%s: If you have a good reason, you may override this lintian tag." % (epackage))
  
      ###########################################################################
      def check_urgency(self):
@@@ -1734,7 -1734,7 +1734,7 @@@ distribution.""
          # <Ganneff> yes
  
          # This routine returns None on success or an error on failure
-         res = get_queue('accepted').autobuild_upload(self.pkg, cnf["Dir::Queue::Accepted"])
+         res = get_or_set_queue('accepted').autobuild_upload(self.pkg, cnf["Dir::Queue::Accepted"])
          if res:
              utils.fubar(res)