fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanups + indent errors

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2013-04-30 11:04:01 +02:00
parent a064cc19b3
commit 8a7c64f86a
2 changed files with 4 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cdist/config_install.py
View file

@ -127,11 +127,11 @@ class ConfigInstall(object):
unfinished_object_names = [] unfinished_object_names = []
for cdist_object in self.object_list(): for cdist_object in self.object_list():
if not cdist_object.state == cdist_object.STATE_DONE: if not cdist_object.state == cdist_object.STATE_DONE:
unfinished_object_names.append(cdist_object.name) unfinished_object_names.append(cdist_object.name)
if unfinished_object_names: if unfinished_object_names:
raise cdist.Error("The following objects could not be resolved: %s" % raise cdist.Error("The following objects could not be resolved: %s" %
(" ".join(unfinished_object_names)) (" ".join(unfinished_object_names)))
###################################################################### ######################################################################
# Stages based code # Stages based code

48
cdist/core/cdist_object.py
View file

@ -224,13 +224,12 @@ class CdistObject(object):
except EnvironmentError as error: except EnvironmentError as error:
raise cdist.Error('Error creating directories for cdist object: %s: %s' % (self, error)) raise cdist.Error('Error creating directories for cdist object: %s: %s' % (self, error))
@property def requirements_satisfied(self, requirements):
def requirements_satisfied(self):
"""Return state whether normal depedencies are satisfied""" """Return state whether normal depedencies are satisfied"""
satisfied = True satisfied = True
for requirement in self.requirements: for requirement in requirements:
cdist_object = self.object_from_name(requirement) cdist_object = self.object_from_name(requirement)
if not cdist_object.state == self.STATE_DONE: if not cdist_object.state == self.STATE_DONE:
@ -241,49 +240,6 @@ class CdistObject(object):
return satisfied return satisfied
@property
def satisfied_requirements(self):
"""Return state whether all of our dependencies have been resolved already"""
satisfied = True
for requirement in self.all_requirements:
log.debug("%s: Checking requirement %s (%s) .." % (self.name, requirement.name, requirement.state))
if not requirement.state == self.STATE_DONE:
satisfied = False
break
log.debug("%s is satisfied: %s" % (self.name, satisfied))
return satisfied
def find_requirements_by_name(self, requirements):
"""Takes a list of requirement patterns and returns a list of matching object instances.
Patterns are expected to be Unix shell-style wildcards for use with fnmatch.filter.
find_requirements_by_name(['__type/object_id', '__other_type/*']) ->
[<Object __type/object_id>, <Object __other_type/any>, <Object __other_type/match>]
"""
# FIXME: think about where/when to store this - probably not here
self.objects = dict((o.name, o) for o in self.list_objects(self.base_path, self.cdist_type.base_path))
object_names = self.objects.keys()
for pattern in requirements:
found = False
for requirement in fnmatch.filter(object_names, pattern):
found = True
yield self.objects[requirement]
if not found:
# FIXME: get rid of the singleton object_id, it should be invisible to the code -> hide it in Object
singleton = os.path.join(pattern, 'singleton')
if singleton in self.objects:
yield self.objects[singleton]
else:
raise RequirementNotFoundError(pattern)
@property @property
def all_requirements(self): def all_requirements(self):
""" """