diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-27 09:45:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-27 09:45:36 -0400 |
| commit | e908d20fcbd847e17345591fc171b59d9a156516 (patch) | |
| tree | def104237fd9b8888a37a5c3378b4ef7e26b6d43 /scripts | |
| parent | bb38d77ca779cc8bdad3d4ceb6cecc687f4987c2 (diff) | |
| parent | 0b9bcf665cd98fe9db0956c894006b250a7d465f (diff) | |
| download | u-boot-e908d20fcbd847e17345591fc171b59d9a156516.tar.gz | |
Merge tag 'v2021.10-rc5' into next
Prepare v2021.10-rc5
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 1 | ||||
| -rwxr-xr-x | scripts/mailmapper | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0fab768713d..61ae682dcdf 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1306,7 +1306,6 @@ CONFIG_STM32_FLASH CONFIG_STV0991 CONFIG_STV0991_HZ CONFIG_STV0991_HZ_CLOCK -CONFIG_ST_SMI CONFIG_SXNI855T CONFIG_SYSFS CONFIG_SYSMGR_ISWGRP_HANDOFF diff --git a/scripts/mailmapper b/scripts/mailmapper index 2e2d7faff57..0e744ec1a0b 100755 --- a/scripts/mailmapper +++ b/scripts/mailmapper @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2014, Masahiro Yamada <yamada.m@jp.panasonic.com> @@ -89,9 +89,10 @@ output = {} for line in shortlog.splitlines(): # tmp, mail = line.rsplit(None, 1) is not safe # because weird email addresses might include whitespaces - tmp, mail = line.split('<') - mail = '<' + mail.rstrip() try: + line = line.decode("utf-8") + tmp, mail = line.split('<') + mail = '<' + mail.rstrip() _, name = tmp.rstrip().split(None, 1) except ValueError: # author name is empty @@ -100,8 +101,11 @@ for line in shortlog.splitlines(): # another name for the same email address prev_name = mail_vs_name[mail] # Take the name with more commits - major_name = sorted([prev_name, name], - key=lambda x: commits_per_name[x] if x else 0)[1] + try: + major_name = sorted([prev_name, name], + key=lambda x: commits_per_name[x] if x else 0)[1] + except: + continue mail_vs_name[mail] = major_name if commits_per_name[major_name] > MIN_COMMITS: output[mail] = major_name |