From: Roderic Morris <roderyc@gmail.com>
Date: Fri, 29 Apr 2011 03:18:00 +0000 (-0400)
Subject: Include social_user in exception raised when an account is already registered.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3f590f681f8b870a51568afff5f48f522bb2d369;p=django-social-auth.git

Include social_user in exception raised when an account is already registered.

Give exception handling code more information to mitigate the conflict.
---

diff --git a/social_auth/backends/__init__.py b/social_auth/backends/__init__.py
index a179c65..76d3dc7 100644
--- a/social_auth/backends/__init__.py
+++ b/social_auth/backends/__init__.py
@@ -138,7 +138,7 @@ class SocialAuthBackend(ModelBackend):
             # would imply update user references on other apps, that's too
             # much intrusive
             if 'user' in kwargs and kwargs['user'] != social_user.user:
-                raise ValueError('Account already in use.')
+                raise ValueError('Account already in use.', social_user)
             user = social_user.user
 
         # Update user account data.