From e18cb4c5c26b4e2bb607609d5ff86d5635a58ee7 Mon Sep 17 00:00:00 2001
From: cohena <cohena@gmail.com>
Date: Thu, 7 Nov 2013 01:36:30 -0800
Subject: [PATCH] Fix another edge case login loop

---
 lib/pygazelle/api.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/pygazelle/api.py b/lib/pygazelle/api.py
index 7a814fa6..75272cd5 100644
--- a/lib/pygazelle/api.py
+++ b/lib/pygazelle/api.py
@@ -99,10 +99,14 @@ class GazelleAPI(object):
                 'password': self.password}
         r = self.session.post(loginpage, data=data)
         if r.status_code != 200:
-            raise LoginException
-        accountinfo = self.request('index')
+            raise LoginException("Login returned status code %s" % r.status_code)
+
+        try:
+            accountinfo = self.request('index', autologin=False)
+        except RequestException as e:
+            raise LoginException("Login probably incorrect")
         if not accountinfo or 'id' not in accountinfo:
-            raise LoginException
+            raise LoginException("Login probably incorrect")
         self.userid = accountinfo['id']
         self.authkey = accountinfo['authkey']
         self.passkey = accountinfo['passkey']