(comdev-people) branch main updated: Ensure unique ids

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/comdev-people.git


The following commit(s) were added to refs/heads/main by this push:
     new 6149008  Ensure unique ids
6149008 is described below

commit 6149008f3d15f35689b438e3b1f9c116e2eb1edd
Author: Sebb <s...@apache.org>
AuthorDate: Sun Nov 30 23:49:36 2025 +0000

    Ensure unique ids
---
 tools/pgp.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/pgp.py b/tools/pgp.py
index 4204721..835d1a3 100644
--- a/tools/pgp.py
+++ b/tools/pgp.py
@@ -271,9 +271,13 @@ summary['_info_']['epochsecs'] = int(time.time())
 
 # write the index entry
 for uid in sorted(people['people'].keys()):
+    num = 0
+    suff = ''
     if uid in ldapkeyfps:
         for fp in ldapkeyfps[uid]:
-            f.write(entryok % (uid,uid,uid,uid,(fp.replace(' ','&nbsp;'))))
+            if num > 0:
+                suff = f"-{num}"
+            f.write(entryok % (uid,uid,uid+suff,uid,(fp.replace(' 
','&nbsp;'))))
             fpc = canon_fp(fp)
             if fpc in dbkeyfps:
                 summary[uid][fp] = 'ok'
@@ -281,9 +285,13 @@ for uid in sorted(people['people'].keys()):
                 summary[uid][fp] = f"subkey of {subkeyfps[fpc]}"
             else:
                 summary[uid][fp] = 'unknown error - should not happen'
+            num += 1
     for fp, reason in badldapkeyfps[uid].items():
-        f.write(entrybad % (uid,uid,uid,fp,reason))
+        if num > 0:
+            suff = f"-{num}"
+        f.write(entrybad % (uid,uid,uid+suff,fp,reason))
         summary[uid][fp] = reason
+        num += 1
 
 with open(os.path.join(COMMITTER_KEYS, "keys.json"), 'w', encoding='utf-8') as 
s:
     json.dump(summary, s, indent=2, sort_keys=True)