[oe-commits] Jan Lübbe : mtn2git: commit the final version used for the bk&mtn to git conversion
GIT User account
git at amethyst.openembedded.net
Wed Oct 15 18:11:48 UTC 2008
Module: openembedded.dev.git
Branch: holger/hash-style
Commit: 242ff4c599f7977bb4ffcb0b85361fb297b7b374
URL: http://gitweb.openembedded.net/?p=openembedded.dev.git&a=commit;h=242ff4c599f7977bb4ffcb0b85361fb297b7b374
Author: Jan Lübbe <jluebbe at debian.org>
Date: Wed Oct 15 11:02:40 2008 +0000
mtn2git: commit the final version used for the bk&mtn to git conversion
---
contrib/mtn2git/manglenames.py | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/contrib/mtn2git/manglenames.py b/contrib/mtn2git/manglenames.py
index 826092c..217a4d2 100755
--- a/contrib/mtn2git/manglenames.py
+++ b/contrib/mtn2git/manglenames.py
@@ -17,7 +17,7 @@ all_names = {
"Andrew Wilcox" : (["awilcox at openembedded.org"], "andy at protium.com"),
"Angus Ainslie" : (["angus at handheldshell.com"], "angus at handheldshell.com"),
"ant" : (["ant", "ant, Jay"], "ant at unknown.openembedded.org"),
- "Antonio ospite" : (["ospite at studenti.unina.it"], "ospite at studenti.unina.it"),
+ "Antonio Ospite" : (["ospite at studenti.unina.it"], "ospite at studenti.unina.it"),
"Antti Andreimann" : (["antti.andreimann at mail.ee", "mailto:antti.andreimann at mail.ee"], "antti.andreimann at mail.ee"),
"araimondi" : (["araimondi at gmx.net"], "araimondi at gmx.net"),
"Arjan Schrijver" : (["arjan at openembedded.org"], "arjan at anymore.nl"),
@@ -127,6 +127,7 @@ all_names = {
"OpenEmbedded Project" : (["oe at openembedded.org"], "openembedded-devel at lists.openembedded.org"),
"Openmoko anonymizer key" : (["openmoko at openembedded.org"], "devel at lists.openmoko.org"),
"Otavio Salvador" : (["otavio at ossystems.com.br", "Otavio Salvador <otavio at debian.org>", "Otavio Salvador <otavio at ossystems.com.br>"], "otavio at ossystems.com.br"),
+ "Ottavio Campana" : (["Ottavio Campana"], "ottavio at campana.vi.it"),
"Ovidiu Sas" : (["osas at nslu2-linux.org"], "sip.nslu at gmail.com"),
"Oyvind Repvik" : (["nail at nslu2-linux.org", "oyvind at repvik.org"], "nail at nslu2-linux.org"),
"Patrick Ohly" : (["pohly at openembedded.org"], "patrick.ohly at gmx.de"),
@@ -134,7 +135,7 @@ all_names = {
"Patrik Gfeller" : (["Patrik Gfeller <gfellerpatrik at gmx.net>", "gfellerpatrik at gmx.net"], "gfellerpatrik at gmx.net"),
"Paul Eggleton" : (["bluelightning", "bluelightning at bluelightning.org", "bluelightning at openembedded.org", "Paul Eggleton"], "bluelightning at bluelightning.org"),
"Paul Sokolovsky" : (["pfalcon at openembedded.org", "pmiscml at gmail.com"], "pmiscml at gmail.com"),
- "Peter Urbanec" : (["peteru at openembedded.org"], "toppy at urbanec.net"),
+ "Peter Urbanec" : (["peteru at openembedded.org", "black.lan!peteru"], "toppy at urbanec.net"),
"Petr Stetiar" : (["ynezz at true.cz", "PetrŠtetiar"], "ynezz at true.cz"),
"Phil Blundell" : (["pb at openembedded.org", "nexus.co.uk!pb", "(none)!pb", "uk[pb]!pb", "reciva.com!pb", "uni-frankfurt.de!pb_"], "philb at gnu.org"),
"Philip Balister" : (["crofton at openembedded.org"], "philip at balister.org"),
@@ -187,7 +188,6 @@ reverse = {
'bitkeeper.com!nslu2-linux.adm' : None,
'bkbits.net!nslu2-linux.adm' : None,
'bkbits.net!openembedded.adm' : None,
- 'black.lan!peteru' : None,
'!ByronT' : None,
'cambridgebroadband.com!rjt' : None,
'conversagent.com!fontenot' : None,
@@ -229,7 +229,7 @@ for name, (ids, email) in all_names.items():
assert not id in reverse
reverse[id] = (name, email)
-rx = re.compile(r"^(author|committer) ([a-zA-Z0-9\[\]\(\)\-\.\_!])* <([a-zA-Z0-9\[\]\(\)\-\.\_\@!]+)> (.+)\n$")
+rx = re.compile(r"^(author|committer) ([a-zA-Z0-9\[\]\(\)\-\.\_!])* <(.+)> (.+)\n$")
last = ""
@@ -246,7 +246,9 @@ for line in sys.stdin:
sys.stderr.write("id unknown %s\n" % repr(g[2]))
if replacement is None:
if '!' in g[2]:
- replacement = (g[2], g[2] + "@bk.openembedded.invalid")
+ domain, addr = g[2].split('!')
+ email = "%s@%s" % (addr, domain)
+ replacement = (email, email)
elif '@' in g[2]:
replacement = (g[2], g[2])
else:
More information about the Openembedded-commits
mailing list