X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/96a5360582493699cf77a1a0b65aa83e42bb1743..6d62b489838f0bb48bf17b276349b1e25c1d4f52:/tasklib/backends.py

diff --git a/tasklib/backends.py b/tasklib/backends.py
index 440cfe4..e6daace 100644
--- a/tasklib/backends.py
+++ b/tasklib/backends.py
@@ -132,7 +132,10 @@ class TaskWarrior(Backend):
         overrides.update(config_override or dict())
         for item in overrides.items():
             command_args.append('rc.{0}={1}'.format(*item))
-        command_args.extend([x.decode('utf-8') for x in args])
+        command_args.extend([
+            x.decode('utf-8') if isinstance(x, six.binary_type)
+            else six.text_type(x) for x in args
+        ])
         return command_args
 
     def _get_version(self):
@@ -274,6 +277,7 @@ class TaskWarrior(Backend):
                 error_msg = stderr.strip()
             else:
                 error_msg = stdout.strip()
+            error_msg += u'\nCommand used: ' + u' '.join(command_args)
             raise TaskWarriorException(error_msg)
 
         # Return all whole triplet only if explicitly asked for