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

resort output in object_run

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2011-10-19 16:47:52 +02:00
commit c189bd9daf
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/cdist/config_install.py
View file

@ -126,7 +126,7 @@ class ConfigInstall(object):
def object_run(self, cdist_object): def object_run(self, cdist_object):
"""Run gencode and code for an object""" """Run gencode and code for an object"""
self.log.info("Starting run of " + cdist_object.name) self.log.debug("Trying to run object " + cdist_object.name)
if cdist_object.state == core.Object.STATE_RUNNING: if cdist_object.state == core.Object.STATE_RUNNING:
# FIXME: resolve dependency circle # FIXME: resolve dependency circle
raise cdist.Error("Detected circular dependency in " + cdist_object.name) raise cdist.Error("Detected circular dependency in " + cdist_object.name)
@ -141,18 +141,16 @@ class ConfigInstall(object):
for requirement in cdist_object.requirements: for requirement in cdist_object.requirements:
self.log.debug("Object %s requires %s", cdist_object, requirement) self.log.debug("Object %s requires %s", cdist_object, requirement)
required_object = cdist_object.object_from_name(requirement) required_object = cdist_object.object_from_name(requirement)
self.log.info("Resolving dependency %s for %s" % (required_object.name, cdist_object.name))
self.object_run(required_object) self.object_run(required_object)
# Generate # Generate
self.log.info("Generating code for " + cdist_object.name) self.log.info("Generating and executing code for " + cdist_object.name)
cdist_object.code_local = self.code.run_gencode_local(cdist_object) cdist_object.code_local = self.code.run_gencode_local(cdist_object)
cdist_object.code_remote = self.code.run_gencode_remote(cdist_object) cdist_object.code_remote = self.code.run_gencode_remote(cdist_object)
if cdist_object.code_local or cdist_object.code_remote: if cdist_object.code_local or cdist_object.code_remote:
cdist_object.changed = True cdist_object.changed = True
# Execute # Execute
self.log.info("Executing code for " + cdist_object.name)
if cdist_object.code_local: if cdist_object.code_local:
self.code.run_code_local(cdist_object) self.code.run_code_local(cdist_object)
if cdist_object.code_remote: if cdist_object.code_remote: