marcoduif/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests 1 Projects Releases Wiki Activity

only run type manifest if it exists

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-13 16:53:07 +02:00
parent 74300ab38e
commit 6dada17509
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/cdist/core/manifest.py
View file

@ -84,13 +84,14 @@ class Manifest(object):
def run_type_manifest(self, cdist_object):
script = os.path.join(self.local.type_path, cdist_object.type.manifest_path)
env = os.environ.copy()
env.update(self.env)
env.update({
'__object': cdist_object.absolute_path,
'__object_id': cdist_object.object_id,
'__object_fq': cdist_object.path,
'__type': cdist_object.type.absolute_path,
'__cdist_manifest': script,
})
return self.local.run_script(script, env=env)
if os.path.isfile(script):
env = os.environ.copy()
env.update(self.env)
env.update({
'__object': cdist_object.absolute_path,
'__object_id': cdist_object.object_id,
'__object_fq': cdist_object.path,
'__type': cdist_object.type.absolute_path,
'__cdist_manifest': script,
})
return self.local.run_script(script, env=env)