Canonical SSO provider

Merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-merge-script into lp:~canonical-isd-hackers/canonical-identity-provider/stable

  1. fix-merge-script
  2. Merge into stable
Proposed by David Owen
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: no longer in the source branch.
Merged at revision: 94
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/fix-merge-script
Merge into: lp:~canonical-isd-hackers/canonical-identity-provider/stable
Diff against target: 12 lines (+2/-1)
1 file modified
identityprovider/bin/accounts_merge.py (+2/-1)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-merge-script
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+49986@code.launchpad.net

Commit message

Adapted merge script for new OAuth relation

To post a comment you must log in.
Revision history for this message
David Owen (dsowen) wrote :

This is proposed to merge to stable, as this is needed in production (a redeploy?).

Revision history for this message
Ricardo Kirkner (ricardokirkner) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/bin/accounts_merge.py'
2--- identityprovider/bin/accounts_merge.py 2011-01-10 15:02:53 +0000
3+++ identityprovider/bin/accounts_merge.py 2011-02-16 15:24:56 +0000
4@@ -75,7 +75,8 @@
5 destination.pk, destination.openid_identifier) + "\n" +
6 str(source.status_comment))
7 try:
8- source.oauth_consumer.token_set.all().delete()
9+ for t in source.oauth_tokens():
10+ t.delete()
11 except Consumer.DoesNotExist:
12 pass
13

Subscribers

People subscribed via source and target branches