Merge remote-tracking branch 'telmich/master'

lib/cdist/core/explorer.py

@@ -126,7 +126,7 @@ class Explorer(object):
         cdist_type = cdist_object.type
         env = self.env.copy()
         env.update({
-            '__object': cdist_object.absolute_path,
+            '__object': os.path.join(self.remote.object_path, cdist_object.path),
             '__object_id': cdist_object.object_id,
             '__object_fq': cdist_object.path,
             '__type_explorer': os.path.join(self.remote.type_path, cdist_type.explorer_path)

lib/cdist/exec/local.py

@@ -40,7 +40,8 @@ class LocalScriptError(cdist.Error):
         self.script_content = script_content
 
     def __str__(self):
-        return "Local script execution failed: %s %s" % (self.script, self.command)
+        plain_command = " ".join(self.command)
+        return "Local script execution failed: %s %s" % (self.script, plain_command)
 
 
 class Local(object):