...
 
Commits (2)
......@@ -103,8 +103,7 @@ def getKeyrings():
for keyring, file in {'keyring': 'debian-keyring', \
'emeritus': 'emeritus-keyring', \
'removed': 'removed-keys' }.iteritems():
for type in [ 'gpg' , 'pgp' ]:
parseKeyring("/srv/qa.debian.org/data/keyrings/keyrings/%s.%s" % (file, type), keyring)
parseKeyring("/srv/qa.debian.org/data/keyrings/keyrings/%s.gpg" % file, keyring)
# Add DM keyring
parseKeyring("/srv/qa.debian.org/data/keyrings/keyrings/debian-maintainers.gpg", "dm")
......@@ -116,24 +115,28 @@ def parseKeyring(keyring_file, keyring):
--with-colons --fingerprint" % keyring_file)
fpr = None
entry = None
lastpub = None
for line in contents.readlines():
items = line.split(':')
uid = None
if items[0] == 'pub':
fpr = entry = None
lastpub = items[9].strip()
continue
elif items[0] == 'fpr':
fpr = "gpg:" + items[9].strip()
extraInfo(fpr, "x:gpg:keyring:"+fpr[4:] + ":" + keyring)
uid = lastpub
continue
elif items[0] == 'uid':
uid = items[9].strip()
else:
continue
# Do stuff with 'uid'
weakRef("uid:"+uid, fpr)
if uid and fpr:
weakRef("uid:"+uid, fpr)
else
sys.stderr.write(
"Missing uid or fingerprint while parsing %s: %s\n" % (
keyring, line))
continue
uid, email = parseUid(uid)
if email:
if email in ['leader@debian.org']:
......@@ -353,7 +356,7 @@ out.write("""# mia-* suffices that are valid
# /srv/qa.debian.org/data/carnivore/extract_data, and used by
# /etc/exim4/exim4.conf to decide what mia-*@qa.debian.org addresses are
# actually valid, in order to reject invalid mail
#
#
# Do not remove or change without coordinating with DSA
""")
......