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

finish run_manifest()

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-07 12:58:35 +02:00
parent 4a98b9af55
commit 00550edfcb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/cdist/config_install.py
View file

@ -83,8 +83,7 @@ class ConfigInstall:
# Information required in every manifest # Information required in every manifest
env['__target_host'] = self.target_host env['__target_host'] = self.target_host
# FIXME: __global == __cdist_out_dir # FIXME: __global == __cdist_out_dir - duplication
# FIXME: __global? shouldn't this be $global?
env['__global'] = self.context.out_dir env['__global'] = self.context.out_dir
# Submit debug flag to manifest, can be used by emulator and types # Submit debug flag to manifest, can be used by emulator and types
@ -95,7 +94,7 @@ class ConfigInstall:
env['__cdist_manifest'] = manifest env['__cdist_manifest'] = manifest
# Required to find types # Required to find types
env['__cdist_type_base_dir'] = self.path.type_base_dir env['__cdist_type_base_dir'] = type.path
# Other environment stuff # Other environment stuff
if extra_env: if extra_env:
@ -104,6 +103,7 @@ class ConfigInstall:
cdist.exec.shell_run_or_debug_fail(manifest, [manifest], env=env) cdist.exec.shell_run_or_debug_fail(manifest, [manifest], env=env)
################################################################################ ################################################################################
def object_run(self, cdist_object, mode): def object_run(self, cdist_object, mode):
"""Run gencode or code for an object""" """Run gencode or code for an object"""
log.debug("Running %s from %s", mode, cdist_object) log.debug("Running %s from %s", mode, cdist_object)