opendev/storyboard
Code Issues Proposed changes

Migration Error with Suspended User

Browse Source 
This change to the migration script handles the
cases where a user has been suspended and the
client gets back a HTTP Error 410: Gone response.

Change-Id: Ied0111b84b93da33fba1bcadfd23d81f0c61e221
This commit is contained in:
Kendall Nelson 2018-01-10 17:02:23 -08:00
parent 72a62c7f0a
commit 7f5a6e332a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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
display_name = lp_user.display_name try:
user_link = lp_user.web_link display_name = lp_user.display_name
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: