From: Mark Hymers <mhy@debian.org>
Date: Wed, 8 Apr 2009 20:49:39 +0000 (+0100)
Subject: Merge commit 'mhyftpmaster/merge'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d8593fb2f5c117790aba12d37c1574fa1bb857cd;hp=ee00ba60099f741819f991db13b4d0fc65bdd960;p=dak.git

Merge commit 'mhyftpmaster/merge'
---

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 8f9857f4..403f1400 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -1014,7 +1014,7 @@ def lookup_uid_from_fingerprint(fpr):
     if qs:
         return qs
     else:
-        return (None, None, None)
+        return (None, None, False)
 
 def check_signed_by_key():
     """Ensure the .changes is signed by an authorized uploader."""
@@ -1024,17 +1024,22 @@ def check_signed_by_key():
         uid_name = ""
 
     # match claimed name with actual name:
-    if uid == None:
+    if uid is None:
+        # This is fundamentally broken but need us to refactor how we get
+        # the UIDs/Fingerprints in order for us to fix it properly
         uid, uid_email = changes["fingerprint"], uid
         may_nmu, may_sponsor = 1, 1
         # XXX by default new dds don't have a fingerprint/uid in the db atm,
         #     and can't get one in there if we don't allow nmu/sponsorship
-    elif is_dm is "t":
-        uid_email = uid
-        may_nmu, may_sponsor = 0, 0
-    else:
+    elif is_dm is False:
+        # If is_dm is False, we allow full upload rights
         uid_email = "%s@debian.org" % (uid)
         may_nmu, may_sponsor = 1, 1
+    else:
+        # Assume limited upload rights unless we've discovered otherwise
+        uid_email = uid
+        may_nmu, may_sponsor = 0, 0
+
 
     if uid_email in [changes["maintaineremail"], changes["changedbyemail"]]:
         sponsored = 0