Handle and convert williamh's addresses to the appropriate key

2 files changed, 8 insertions, 4 deletions

diff --git a/README b/README
index 95bdbc0..9608ea3 100644
--- a/README
+++ b/README
@@ -47,3 +47,9 @@ That repo is ready to go at that point.
 
 For a full production run, ./script.sh --full # is the fastest form (basically allows the final linearization,
 deduplication, etc, to run in parallel as work is available.  not a huge gain, but shaves a minute off or so).
+
+Finally, certain conversion have occured commit message wise; git footers now exist,
+standardizing the package-manager/signingkey/repoman footers.
+
+In particularly, the signing 'key' of 'ultrabug' was removed (user from far in the past).
+Additionally, 'wiliamh@gentoo.org' was converted to 0x30C46538 (the actual key; done to standardize it).
diff --git a/rewrite-commit-dump.py b/rewrite-commit-dump.py
index 3744fb3..148a9a3 100755
--- a/rewrite-commit-dump.py
+++ b/rewrite-commit-dump.py
@@ -70,10 +70,8 @@ def mangle_portage(match, allowed=frozenset('abcdef0123456789')):
     if signage in ('key', 'ultrabug'):
       # Known bad keys; this is why portage needs to do basic enforcement...
       signage = None
-    elif '@' in signage:
-      # Bleh.  be paranoid, ensure case wasn't affected.
-      assert signage in content, (signage, content)
-      signage = '<%s>' % signage
+    elif signage in ('williamh@gentoo.org', 'w.d.hubbs@gmail.com'):
+      signage = '30C46538'
     elif signage.endswith('!'):
       assert allowed.issuperset(signage[:-1]), content
     else: