Merge branch 'master' into jakePR185

epishova · Apr 8, 2019 · 2277c23 · 2277c23
2 parents 57d4813 + cfe92cb
commit 2277c23
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/tools/gsuite-exporter/gsuite_exporter/cli.py b/tools/gsuite-exporter/gsuite_exporter/cli.py
@@ -66,7 +66,10 @@ def sync_all(
 
     for app in applications:
         last_ts = exporter.get_last_timestamp(app)
-        start_time = (parser.parse(last_ts) - timedelta(minutes=offset)).isoformat()
+        if last_ts is None:
+            start_time = None
+        else:
+            start_time = (parser.parse(last_ts) - timedelta(minutes=offset)).isoformat()
         exporter_dest = exporter.get_destination(app)
         logger.info(
             "%s.%s --> %s (%s) [starting new sync] from %s (offset => %s mn)",