leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patman: Adjust handling of unicode email address

Browse Source 
Don't mess with the email address when outputting them. Just make sure
they are encoded with utf-8.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
This commit is contained in:
Simon Glass 2017-05-29 15:31:23 -06:00
parent 21caa558ca
commit 6f8abf765b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/patman/gitutil.py
View File

@ -407,6 +407,8 @@ def EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname,
cc = []
cmd = ['git', 'send-email', '--annotate']
if in_reply_to:
if type(in_reply_to) != str:
in_reply_to = in_reply_to.encode('utf-8')
cmd.append('--in-reply-to="%s"' % in_reply_to)
if thread:
cmd.append('--thread')

10
tools/patman/series.py
View File

@ -119,7 +119,7 @@ class Series(dict):
email = col.Color(col.YELLOW, "<alias '%s' not found>"
% tag)
if email:
print(' Cc: ', email.encode('utf-8'))
print(' Cc: ', email)
print
for item in to_set:
print('To:\t ', item)
@ -229,13 +229,17 @@ class Series(dict):
raise_on_error=raise_on_error)
if add_maintainers:
list += get_maintainer.GetMaintainer(commit.patch)
list = [m.encode('utf-8') if type(m) != str else m for m in list]
all_ccs += list
print(commit.patch, ', '.join(set(list)).encode('utf-8'), file=fd)
print(commit.patch, ', '.join(set(list)), file=fd)
self._generated_cc[commit.patch] = list
if cover_fname:
cover_cc = gitutil.BuildEmailList(self.get('cover_cc', ''))
cc_list = ', '.join([x.decode('utf-8') for x in set(cover_cc + all_ccs)])
cover_cc = [m.encode('utf-8') if type(m) != str else m
for m in cover_cc]
cc_list = ', '.join([x.decode('utf-8')
for x in set(cover_cc + all_ccs)])
print(cover_fname, cc_list.encode('utf-8'), file=fd)
fd.close()