Merge lp:~andreagrandi/ubuntu-accomplishments-system/daemon-crash into lp:~jonobacon/ubuntu-accomplishments-system/trophyinfo

[Andrea Grandi]

Fix a crash of the Ubuntu Accomplishments System daemon that occurs when user has not configured an Ubuntu One account yet.

[Jono Bacon (jonobacon)]

Just to let you know, Andrea, I am holding off merging this in until I have merged in Duncan's branch as his branch moves a lot of code around. I will then merge in these changes then. Thanks!

[Andrea Grandi (andreagrandi)]

It's ok Jono, feel free to merge it when you need it :)

[Jono Bacon (jonobacon)]

It looks like Duncan fixed this when he created his branch, but thanks for sharing this, Andrea!

Unmerged revisions

65. By Andrea Grandi on 2012-02-28

Daemon doesn't crash anymore if you didn't configure an Ubuntu One account.

=== modified file 'daemon/libaccomplishments-daemon/daemon.py'
--- daemon/libaccomplishments-daemon/daemon.py	2012-02-24 06:08:50 +0000
+++ daemon/libaccomplishments-daemon/daemon.py	2012-02-28 17:34:23 +0000
@@ -287,7 +287,13 @@
     def verifyU1Account(self):
         # check if this machine has an Ubuntu One account
         logging.info("Check if this machine has an Ubuntu One account...")
-        u1email = json.loads(auth.request(url='https://one.ubuntu.com/api/account/')[1])['email']
+
+	u1email = None
+
+	try:
+	        u1email = json.loads(auth.request(url='https://one.ubuntu.com/api/account/')[1])['email']
+	except Exception, (msg):
+		print "WARNING: You need to configure an Ubuntu One account first!"
 
         if u1email is None:
             logging.info("...No.")