opendev/storyboard
Code Issues Proposed changes

Merge "Migration Error with Suspended User"

Browse Source
This commit is contained in:
Zuul 2018-03-20 23:16:08 +00:00 committed by Gerrit Code Review
commit 7f0ae3617e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,8 @@ import re
import sys import sys
import uuid import uuid
from lazr.restfulclient import errors
from openid.consumer import consumer from openid.consumer import consumer
from openid.consumer.discover import DiscoveryFailure from openid.consumer.discover import DiscoveryFailure
from openid import cryptutil from openid import cryptutil
@ -110,11 +112,13 @@ class LaunchpadWriter(object):
:param lp_user: The launchpad user record. :param lp_user: The launchpad user record.
:return: The SQLAlchemy entity for the user record. :return: The SQLAlchemy entity for the user record.
""" """
if lp_user is None:
return lp_user
try:
display_name = lp_user.display_name display_name = lp_user.display_name
user_link = lp_user.web_link user_link = lp_user.web_link
except errors.HTTPError:
display_name = "Disabled Launchpad User"
user_link = "000000000000000000000"
# Resolve the openid. # Resolve the openid.
if user_link not in self._openid_map: if user_link not in self._openid_map: