# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1476782733 -10800
# Node ID 8cf20367a372be210fee76c6c3ab3926b7d1493b
# Parent  7677c4992381c6bd9b23d6cbf9f3d5f871027e88
Add exception checking to calendar list fetching.

diff -r 7677c4992381 -r 8cf20367a372 multimerge.py
--- a/multimerge.py	Tue Oct 18 12:24:44 2016 +0300
+++ b/multimerge.py	Tue Oct 18 12:25:33 2016 +0300
@@ -461,11 +461,14 @@
 cal_token = None
 while True:
     # We want everything except deleted and hidden calendars
-    result = service.calendarList().list(
-        showHidden=False,
-        showDeleted=False,
-        pageToken=cal_token
-        ).execute()
+    try:
+        result = service.calendarList().list(
+            showHidden=False,
+            showDeleted=False,
+            pageToken=cal_token
+            ).execute()
+    except Exception as e:
+        gcm_fatal(u"Failed to fetch calendar list:\n\nERROR: {0}\n".format(str(e)))
 
     calendars.extend(result.get("items", []))
     cal_token = result.get("nextPageToken")