X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=9acdcdd90d5fc06679ea877c8a91865a3587a10a;hb=5833d1eb6cd1a27cc28cc3e5bdea677bed3915bc;hp=14a9c775b6663cb8f35f792a65cd9bc49c3672f6;hpb=2cd389cc6a64de00500f349db12046d7a87783e2;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 14a9c775..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, f.is_dm 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)
@@ -1060,7 +1060,7 @@ 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:
-                    should_reject=True
+                    should_reject=False
                     break
 
         if should_reject == True: