From 7f5a6e332a4cf61bb67fac1168fc58c93ac40f12 Mon Sep 17 00:00:00 2001 From: Kendall Nelson Date: Wed, 10 Jan 2018 17:02:23 -0800 Subject: [PATCH] Migration Error with Suspended User 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 --- storyboard/migrate/launchpad/writer.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/storyboard/migrate/launchpad/writer.py b/storyboard/migrate/launchpad/writer.py index bd08caa1..4c6fdabf 100644 --- a/storyboard/migrate/launchpad/writer.py +++ b/storyboard/migrate/launchpad/writer.py @@ -17,6 +17,8 @@ import re import sys import uuid +from lazr.restfulclient import errors + from openid.consumer import consumer from openid.consumer.discover import DiscoveryFailure from openid import cryptutil @@ -110,11 +112,13 @@ class LaunchpadWriter(object): :param lp_user: The launchpad user record. :return: The SQLAlchemy entity for the user record. """ - if lp_user is None: - return lp_user - display_name = lp_user.display_name - user_link = lp_user.web_link + try: + 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. if user_link not in self._openid_map: