From 116f72a39978611f046b3a6b8358abd2ca379e40 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sat, 24 Mar 2018 00:50:08 +0000 Subject: [PATCH] Finish fixing account duplication on import 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 --- storyboard/migrate/launchpad/writer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storyboard/migrate/launchpad/writer.py b/storyboard/migrate/launchpad/writer.py index bfbe3500..a6eafc91 100644 --- a/storyboard/migrate/launchpad/writer.py +++ b/storyboard/migrate/launchpad/writer.py @@ -120,8 +120,6 @@ class LaunchpadWriter(object): display_name = "Disabled Launchpad User" user_link = "000000000000000000000" - user_link.replace('login.launchpad.net', 'login.ubuntu.com') - # Resolve the openid. if user_link not in self._openid_map: try: @@ -130,6 +128,8 @@ class LaunchpadWriter(object): None) openid_request = openid_consumer.begin(user_link) openid = openid_request.endpoint.getLocalID() + openid = openid.replace( + 'login.launchpad.net', 'login.ubuntu.com') self._openid_map[user_link] = openid except DiscoveryFailure: