Merge remote branch 'ftpmaster/master'

diff --combined daklib/queue.py
index e12a99715e255f335ba3c5adc43596abd7dc86a3,ba4869b29b29885539ecfc8df54653af638ad4d6..ec5afeb7fd707977046437a3f84ad12032f2bca5
--- 1/daklib/queue.py
--- 2/daklib/queue.py
+++ b/daklib/queue.py
@@@ -1180,9 -1180,6 +1180,9 @@@ class Upload(object)
          if not self.pkg.changes["architecture"].has_key("source"):
              return True
  
 +        if session is None:
 +            session = DBConn().session()
 +
          (status, reason) = self.load_dsc(action=action)
          if not status:
              self.rejects.append(reason)
@@@ -1220,11 -1217,7 +1220,11 @@@
  
          # Only a limited list of source formats are allowed in each suite
          for dist in self.pkg.changes["distribution"].keys():
 -            allowed = [ x.format_name for x in get_suite_src_formats(dist, session) ]
 +            suite = get_suite(dist, session=session)
 +            if not suite:
 +                self.rejects.append("%s: cannot find suite %s when checking source formats" % (dsc_filename, dist))
 +                continue
 +            allowed = [ x.format_name for x in suite.srcformats ]
              if self.pkg.dsc["format"] not in allowed:
                  self.rejects.append("%s: source format '%s' not allowed in %s (accepted: %s) " % (dsc_filename, self.pkg.dsc["format"], dist, ", ".join(allowed)))
  
@@@ -2007,6 -2000,11 +2007,11 @@@ distribution.""
          """
  
          cnf = Config()
+ 
+         # Skip all of this if not sending mail to avoid confusing people
+         if cnf.has_key("Dinstall::Options::No-Mail") and cnf["Dinstall::Options::No-Mail"]:
+             return summary
+ 
          announcetemplate = os.path.join(cnf["Dir::Templates"], 'process-unchecked.announce')
  
          # Only do announcements for source uploads with a recent dpkg-dev installed