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

use list not method

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-07 16:23:33 +02:00
commit 2c9beb9506
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/cdist/config_install.py
View file

@ -232,7 +232,8 @@ class ConfigInstall:
def stage_run(self): def stage_run(self):
"""The final (and real) step of deployment""" """The final (and real) step of deployment"""
log.info("Generating and executing code") log.info("Generating and executing code")
for cdist_object in cdist.core.Object.list_objects(self.context.object_base_path): for cdist_object in cdist.core.Object.list_objects(self.context.object_base_path,
self.context.type_base_path):
log.debug("Run object: %s", cdist_object) log.debug("Run object: %s", cdist_object)
self.object_run(cdist_object) self.object_run(cdist_object)
@ -259,7 +260,8 @@ class ConfigInstall:
new_objects_created = True new_objects_created = True
while new_objects_created: while new_objects_created:
new_objects_created = False new_objects_created = False
for cdist_object in cdist.core.Object.list_objects(self.context.object_base_path): for cdist_object in cdist.core.Object.list_objects(self.context.object_base_path,
self.context.type_base_path):
if cdist_object.prepared: if cdist_object.prepared:
log.debug("Skipping rerun of object %s", cdist_object) log.debug("Skipping rerun of object %s", cdist_object)
continue continue
@ -286,16 +288,16 @@ class ConfigInstall:
self.transfer_path(self.context.global_explorer_path, self.transfer_path(self.context.global_explorer_path,
self.remote_global_explorer_path) self.remote_global_explorer_path)
def transfer_type_explorers(self, type): def transfer_type_explorers(self, cdist_type):
"""Transfer explorers of a type, but only once""" """Transfer explorers of a type, but only once"""
if type.transferred_explorers: if cdist_type.transferred_explorers:
log.debug("Skipping retransfer for explorers of %s", type) log.debug("Skipping retransfer for explorers of %s", type)
return return
else: else:
# Do not retransfer # Do not retransfer
type.transferred_explorers = True cdist_type.transferred_explorers = True
explorers = type.explorers() explorers = cdist_type.explorers
if len(explorers) > 0: if len(explorers) > 0:
rel_path = os.path.join(type.explorer_path(), explorer) rel_path = os.path.join(type.explorer_path(), explorer)