X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=9acdcdd90d5fc06679ea877c8a91865a3587a10a;hb=2b4d5bf75e28a6b5fa5afbd58defdf661c893033;hp=7d8d4f233d15033d8384080f33bb6221cb491c39;hpb=279743ce44cd6c487ad57bcd3d15306402893763;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 7d8d4f23..9acdcdd9 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -997,7 +997,7 @@ def check_timestamps():
 ################################################################################
 
 def lookup_uid_from_fingerprint(fpr):
-    q = Upload.projectB.query("SELECT u.uid, u.name, u.debian_maintainer FROM fingerprint f, uid u WHERE f.uid = u.id AND f.fingerprint = '%s'" % (fpr))
+    q = Upload.projectB.query("SELECT u.uid, u.name, k.debian_maintainer FROM fingerprint f JOIN keyrings k ON (f.keyring=k.id), uid u WHERE f.uid = u.id AND f.fingerprint = '%s'" % (fpr))
     qs = q.getresult()
     if len(qs) == 0:
         return (None, None)
@@ -1047,13 +1047,12 @@ def check_signed_by_key():
 
         highest_sid, highest_version = None, None
 
-        is_allowed = 1
+        should_reject = True
         for si in q.getresult():
             if highest_version == None or apt_pkg.VersionCompare(si[1], highest_version) == 1:
                  highest_sid = si[0]
                  highest_version = si[1]
 
-        print highest_sid
         if highest_sid == None:
            reject("Source package %s does not have 'DM-Upload-Allowed: yes' in its most recent version" % changes["source"])
         else:
@@ -1061,10 +1060,10 @@ def check_signed_by_key():
             for m in q.getresult():
                 (rfc822, rfc2047, name, email) = utils.fix_maintainer(m[0])
                 if email == uid_email or name == uid_name:
-                    is_allowed=0
+                    should_reject=False
                     break
 
-        if is_allowed:
+        if should_reject == True:
             reject("%s is not in Maintainer or Uploaders of source package %s" % (uid, changes["source"]))
 
         for b in changes["binary"].keys():