X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=a2079e81c10c869f301f5d0edc558ef6145d382e;hb=5824bf2367f8e9f76266a1567172e86a24d6a1bd;hp=a8f741026155e955a56b9876d1eafa9a3652fd26;hpb=b914f454352aae3e710f5169b9aef1a9371dd4a5;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index a8f74102..a2079e81 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -47,7 +47,7 @@ from daklib.dbconn import DBConn, DBSource, has_new_comment, PolicyQueue, \ get_uid_from_fingerprint from daklib.policy import PolicyQueueUploadHandler from daklib.textutils import fix_maintainer -from daklib.utils import get_login_from_ldap +from daklib.utils import get_logins_from_ldap from daklib.dak_exceptions import * Cnf = None @@ -416,6 +416,7 @@ def process_queue(queue, log, rrd_dir): max_source_len = 0 max_version_len = 0 max_arch_len = 0 + logins = get_logins_from_ldap() for i in per_source_items: maintainer = {} maint="" @@ -466,7 +467,8 @@ def process_queue(queue, log, rrd_dir): sponsor_name = get_uid_from_fingerprint(fingerprint).name sponsor_login = get_uid_from_fingerprint(fingerprint).uid if '@' in sponsor_login: - sponsor_login = get_login_from_ldap(fingerprint) + if fingerprint in logins: + sponsor_login = logins[fingerprint] if (sponsor_name != maintainer["maintainername"] and sponsor_name != changeby["changedbyname"] and sponsor_login + '@debian.org' != maintainer["maintaineremail"] and