diff options
author | 2012-10-16 19:39:57 -0700 | |
---|---|---|
committer | 2012-10-16 19:39:57 -0700 | |
commit | 9225910fff60d3a7b3a876a0dd926e6edc7fd0d6 (patch) | |
tree | 61cfc03ee3d7146d9ed7749d1604c29db78f0852 | |
parent | Avoid having to hold rewrite-commit-dump in memory via using the intermediate... (diff) | |
download | git-conversion-tools-9225910fff60d3a7b3a876a0dd926e6edc7fd0d6.tar.gz git-conversion-tools-9225910fff60d3a7b3a876a0dd926e6edc7fd0d6.tar.bz2 git-conversion-tools-9225910fff60d3a7b3a876a0dd926e6edc7fd0d6.zip |
Handle and convert williamh's addresses to the appropriate key
-rw-r--r-- | README | 6 | ||||
-rwxr-xr-x | rewrite-commit-dump.py | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -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: |