X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=edd14d7e231b4d1ca2c54aa25502024e877a7ce7;hb=473d5f7657d185319a111717f4203bc4dd6defe3;hp=d73b4797732bc278a64996661d9c1934b6783b92;hpb=8f3d8eecf835baaf39d30333ff85f0b0d6fed010;p=dak.git

diff --git a/daklib/queue.py b/daklib/queue.py
index d73b4797..edd14d7e 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -290,16 +290,13 @@ class Upload(object):
         msg = ''
 
         if len(self.rejects) > 0:
-            msg += "Reject Reasons:\n"
-            msg += "\n".join(self.rejects)
+            msg += "\n\nReject Reasons:\n%s" % "\n".join(self.rejects)
 
         if len(self.warnings) > 0:
-            msg += "Warnings:\n"
-            msg += "\n".join(self.warnings)
+            msg += "\n\nWarnings:\n%s" % "\n".join(self.warnings)
 
         if len(self.notes) > 0:
-            msg += "Notes:\n"
-            msg += "\n".join(self.notes)
+            msg += "\n\nNotes:\n%s" % "\n".join(self.notes)
 
         return msg
 
@@ -1263,11 +1260,11 @@ class Upload(object):
                 'OldProposedUpdates', 'Embargoed', 'Unembargoed')
 
             for queue in queues:
-                if 'Dir::Queue::%s' % directory not in cnf:
+                if not cnf.get('Dir::Queue::%s' % queue):
                     continue
 
                 queuefile_path = os.path.join(
-                    cnf['Dir::Queue::%s' % directory], filename
+                    cnf['Dir::Queue::%s' % queue], filename
                 )
 
                 if not os.path.exists(queuefile_path):
@@ -1284,6 +1281,10 @@ class Upload(object):
     def check_lintian(self):
         cnf = Config()
 
+        # Don't reject binary uploads
+        if not self.pkg.changes['architecture'].has_key('source'):
+            return
+
         # Only check some distributions
         valid_dist = False
         for dist in ('unstable', 'experimental'):
@@ -1374,14 +1375,16 @@ class Upload(object):
                 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))
-                    log("overidden tag is overridden", etag)
+                    log("ftpmaster does not allow tag to be overridable", etag)
             else:
                 # Tag is known, it is not overriden, direct reject.
                 self.rejects.append("%s: Found lintian output: '%s %s', automatically rejected package." % (epackage, etag, etext))
-                log("auto rejecting", etag)
                 # Now tell if they *might* override it.
                 if etag in lintiantags['warning']:
+                    log("auto rejecting", "overridable", etag)
                     self.rejects.append("%s: If you have a good reason, you may override this lintian tag." % (epackage))
+                else:
+                    log("auto rejecting", "not overridable", etag)
 
     ###########################################################################
     def check_urgency(self):