Rearrange order of travis commands

[etc/taskwarrior.git] / tasklib / task.py

diff --git a/tasklib/task.py b/tasklib/task.py
index c267048fb15154a4d7ec3427b018fb228f747aa8..280f961e1c360c31c1a2f44b906f5f5b36c6a34e 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -266,7 +266,11 @@ class TaskWarrior(object):
         tasks = []
         for line in self.execute_command(args):
             if line:
         tasks = []
         for line in self.execute_command(args):
             if line:

-                tasks.append(Task(self, json.loads(line.strip(','))))
+                data = line.strip(',')
+                try:
+                    tasks.append(Task(self, json.loads(data)))
+                except ValueError:
+                    raise TaskWarriorException('Invalid JSON: %s' % data)

         return tasks
 
     def merge_with(self, path, push=False):
         return tasks
 
     def merge_with(self, path, push=False):