openstack/election
Code Issues Proposed changes

Fix get_fullname to support multiple account

Browse Source 
This change fixes the get_fullname logic to use a gerrit
query instead of a direct account lookup. This makes the method
work when a candidate has multiple accounts using a single mail
address, e.g.:

https://review.openstack.org/accounts/eric.guo@easystack.cn doesn't work
https://review.openstack.org//accounts/?q=eric.guo@easystack.cn works

Change-Id: I92e68a30533f3e93edce8902f17690243499b5ca
This commit is contained in:
Tristan Cacqueray 2017-01-19 07:24:30 +00:00
parent e6d699de43
commit 5cb88ff9bf
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openstack_election/utils.py
View File

@ -81,6 +81,16 @@ def get_email(filepath):
return git.stdout.readlines()[-1][:-1]
def get_gerrit_account(email):
url = '%s/accounts/?q=%s' % (GERRIT_BASE, email)
accounts = gerrit_query(url)
if not accounts:
raise ValueError("Couldn't find gerrit account with '%s'" % email)
if len(accounts) != 1:
print("[I] %s has multiple account: %s" % (email, accounts))
return accounts[0]
def get_fullname(filepath):
# Check if filepath is an exception
if exceptions is None:
@ -90,8 +100,7 @@ def get_fullname(filepath):
# Otherwise query gerrit using git log email
email = get_email(filepath)
url = '%s/accounts/%s' % (GERRIT_BASE, email)
fullname = gerrit_query(url)['name']
fullname = get_gerrit_account(email)['name']
# Remove parenthesis content
fullname = re.sub(r"\([^)]*\)", "", fullname)