Merge remote-tracking branch 'steven/master'

This commit is contained in:
Nico Schottelius 2011-10-18 15:14:44 +02:00
commit 4d4287c580
8 changed files with 83 additions and 20 deletions

View file

@ -92,9 +92,10 @@ class Manifest(object):
env = os.environ.copy()
env.update(self.env)
env.update({
'__self': cdist_object.name,
'__object': cdist_object.absolute_path,
'__object_id': cdist_object.object_id,
'__object_fq': cdist_object.path,
'__object_fq': cdist_object.name,
'__type': cdist_object.type.absolute_path,
'__cdist_manifest': script,
})