Fixed to handle multiple DD/DM keyrings, and ldap to handle new DM status

[dak.git] / dak / import_ldap_fingerprints.py

diff --git a/dak/import_ldap_fingerprints.py b/dak/import_ldap_fingerprints.py
index b568285357180b6d53a0dc690c3c922e207c6e92..4cc8aa01c8cd7f4f2e784460bc3b8d983a5cfba4 100755 (executable)
--- a/dak/import_ldap_fingerprints.py
+++ b/dak/import_ldap_fingerprints.py
@@ -151,7 +151,7 @@ SELECT f.fingerprint, f.id, u.uid FROM fingerprint f, uid u WHERE f.uid = u.id
                     print "Assigning %s to 0x%s." % (uid, fingerprint)
                 elif existing_uid == uid:
                     pass
-                elif existing_uid[:3] == "dm:":
+                elif '@' not in existing_ui:
                     q = projectB.query("UPDATE fingerprint SET uid = %s WHERE id = %s" % (uid_id, fingerprint_id))
                     print "Promoting DM %s to DD %s with keyid 0x%s." % (existing_uid, uid, fingerprint)
                 else: