Rearrange order of travis commands

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

diff --git a/tasklib/task.py b/tasklib/task.py
index e346f6704b627b5551edfb0bda8a4b2fc69bb002..280f961e1c360c31c1a2f44b906f5f5b36c6a34e 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -230,7 +230,7 @@ class TaskQuerySet(object):
 class TaskWarrior(object):
     def __init__(self, data_location='~/.task', create=True):
         data_location = os.path.expanduser(data_location)
 class TaskWarrior(object):
     def __init__(self, data_location='~/.task', create=True):
         data_location = os.path.expanduser(data_location)

-        if not os.path.exists(data_location):
+        if create and not os.path.exists(data_location):

             os.makedirs(data_location)
         self.config = {
             'data.location': os.path.expanduser(data_location),
             os.makedirs(data_location)
         self.config = {
             'data.location': os.path.expanduser(data_location),


@@ -254,7 +254,10 @@ class TaskWarrior(object):
                              stderr=subprocess.PIPE)
         stdout, stderr = p.communicate()
         if p.returncode:
                              stderr=subprocess.PIPE)
         stdout, stderr = p.communicate()
         if p.returncode:

-            error_msg = stderr.strip().splitlines()[-1]
+            if stderr.strip():
+                error_msg = stderr.strip().splitlines()[-1]
+            else:
+                error_msg = stdout.strip()

             raise TaskWarriorException(error_msg)
         return stdout.strip().split('\n')
 
             raise TaskWarriorException(error_msg)
         return stdout.strip().split('\n')
 


@@ -263,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):