Friends

Merge lp:~robru/friends/lp_1135038 into lp:~super-friends/friends/raring

  1. lp_1135038
  2. Merge into raring
Proposed by Robert Bruce Park
Status: Merged
Approved by: Ken VanDine
Approved revision: 168
Merged at revision: 169
Proposed branch: lp:~robru/friends/lp_1135038
Merge into: lp:~super-friends/friends/raring
Diff against target: 15 lines (+6/-1)
1 file modified
friends/utils/authentication.py (+6/-1)
To merge this branch: bzr merge lp:~robru/friends/lp_1135038
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+153204@code.launchpad.net

Description of the change

Stop raising AuthenticationError when we get userActionFinished error 10, mardy says it's harmless.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'friends/utils/authentication.py'
2--- friends/utils/authentication.py 2013-02-05 01:11:35 +0000
3+++ friends/utils/authentication.py 2013-03-13 17:37:24 +0000
4@@ -66,5 +66,10 @@
5 def _login_cb(self, session, reply, error, user_data):
6 self._reply = reply
7 if error:
8- raise AuthorizationError(self.account.id, error.message)
9+ exception = AuthorizationError(self.account.id, error.message)
10+ # Mardy says this error can happen during normal operation.
11+ if error.message.endswith('userActionFinished error: 10'):
12+ log.error(str(exception))
13+ else:
14+ raise exception
15 log.debug('Login completed')

Subscribers

People subscribed via source and target branches