ensure object is not ran twice

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-16 15:08:00 +02:00
parent 32b2c49d32
commit 420b6aeae7

View file

@ -88,7 +88,7 @@ class ConfigInstall(object):
for cdist_object in core.Object.list_objects(self.local.object_path, for cdist_object in core.Object.list_objects(self.local.object_path,
self.local.type_path): self.local.type_path):
if cdist_object.prepared: if cdist_object.prepared:
self.log.debug("Skipping rerun of object %s", cdist_object) self.log.debug("Skipping re-prepare of object %s", cdist_object)
continue continue
else: else:
self.object_prepare(cdist_object) self.object_prepare(cdist_object)
@ -128,8 +128,11 @@ class ConfigInstall(object):
self.log.info("Running gencode and code for " + cdist_object.name) self.log.info("Running gencode and code for " + cdist_object.name)
# Catch requirements, which re-call us # Catch requirements, which re-call us
# FIXME: change .ran to running
if cdist_object.ran: if cdist_object.ran:
return return
else:
cdist_object.ran = True
cdist_type = cdist_object.type cdist_type = cdist_object.type