From a1bdbaf81eaf415f61ac2c88da19712fe88afe6d Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 8 Nov 2016 19:19:45 +0000 Subject: [PATCH] Fixed some issues with mkdevbranch; giving better normalization of the input to uniq, and correctly using the alias list to provide the correct alias for email addresses where localpart should not be used to derive the svn branch name. - Legacy-Id: 12312 --- bin/mkdevbranch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/mkdevbranch b/bin/mkdevbranch index 03da96ee3..c9734d58a 100755 --- a/bin/mkdevbranch +++ b/bin/mkdevbranch @@ -150,16 +150,17 @@ else import sys, re afile = open("aliases") aliases = dict([ line.strip().split(None,1) for line in afile.read().splitlines() ]) + for line in sys.stdin: blank, name, email, rest = line.strip().split("||", 3) login, dummy = re.split("[@.]", email, 1) - if login in aliases: - login = aliases[login] + if email in aliases: + login = aliases[email] print "\t".join((login.strip().lower(), email.strip().lower(), name.strip())) ' \ | update $progdir/sprint$n.txt done - cat $(ls $progdir/sprint*.txt | tail -n 2) $progdir/extras.txt | sed 's/[ \t]*$//' | sort | uniq | while read login email name; do + cat $(ls $progdir/sprint*.txt | tail -n 2) $progdir/extras.txt | sed -r -e 's/[ \t]*$//' -e 's/[ \t]+/ /g' | sort | uniq | while read login email name; do echo "" echo "$login ($name <$email>):" mksvndir $login