opendev/storyboard
Code Issues Proposed changes

Finish fixing account duplication on import

Browse Source 
The rewrite needs to happen on the openid URL, not the user_link
(the latter is the account profile URL on LP).

Change-Id: I81725a45a9056c974c3e8fb8a180f9928f317146
This commit is contained in:
Jeremy Stanley 2018-03-24 00:50:08 +00:00
parent 86dc566448
commit 116f72a399
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storyboard/migrate/launchpad/writer.py
View File

@ -120,8 +120,6 @@ class LaunchpadWriter(object):
display_name = "Disabled Launchpad User" display_name = "Disabled Launchpad User"
user_link = "000000000000000000000" user_link = "000000000000000000000"
user_link.replace('login.launchpad.net', 'login.ubuntu.com')
# Resolve the openid. # Resolve the openid.
if user_link not in self._openid_map: if user_link not in self._openid_map:
try: try:
@ -130,6 +128,8 @@ class LaunchpadWriter(object):
None) None)
openid_request = openid_consumer.begin(user_link) openid_request = openid_consumer.begin(user_link)
openid = openid_request.endpoint.getLocalID() openid = openid_request.endpoint.getLocalID()
openid = openid.replace(
'login.launchpad.net', 'login.ubuntu.com')
self._openid_map[user_link] = openid self._openid_map[user_link] = openid
except DiscoveryFailure: except DiscoveryFailure: