Mercurial > hg > gcmultimerge

changeset 109:8cf20367a372

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add exception checking to calendar list fetching.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 18 Oct 2016 12:25:33 +0300
parents 7677c4992381
children c6771a596d77
files multimerge.py
diffstat 1 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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")