kjg/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'telmich/master'

Browse source
This commit is contained in:
Steven Armstrong 2011-10-14 23:52:51 +02:00
commit fb2a3cb06e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/cdist/core/explorer.py
View file

@ -126,7 +126,7 @@ class Explorer(object):
cdist_type = cdist_object.type cdist_type = cdist_object.type
env = self.env.copy() env = self.env.copy()
env.update({ 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_id': cdist_object.object_id,
'__object_fq': cdist_object.path, '__object_fq': cdist_object.path,
'__type_explorer': os.path.join(self.remote.type_path, cdist_type.explorer_path) '__type_explorer': os.path.join(self.remote.type_path, cdist_type.explorer_path)

3
lib/cdist/exec/local.py
View file

@ -40,7 +40,8 @@ class LocalScriptError(cdist.Error):
self.script_content = script_content self.script_content = script_content
def __str__(self): 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): class Local(object):