From 369305f37643c1d26cf7b0551e83a99f033796ad Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 19 Dec 2012 15:33:41 +0100 Subject: [PATCH] remove circularreferenceerror, because it is not being used anymore Signed-off-by: Nico Schottelius --- cdist/core/cdist_object.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/cdist/core/cdist_object.py b/cdist/core/cdist_object.py index 3e5e33b7..cc9aeaa5 100644 --- a/cdist/core/cdist_object.py +++ b/cdist/core/cdist_object.py @@ -234,18 +234,14 @@ class CdistObject(object): """ - # FIXME: think about where to store this - probably not here + # 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() - print("a:%s" % self.objects) - print("b:%s" % object_names) - for pattern in requirements: found = False for requirement in fnmatch.filter(object_names, pattern): found = True - print("c:%s" % self.objects[requirement]) 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 @@ -268,15 +264,6 @@ class CdistObject(object): return set(all_reqs) -class CircularReferenceError(cdist.Error): - def __init__(self, cdist_object, required_object): - self.cdist_object = cdist_object - self.required_object = required_object - - def __str__(self): - return 'Circular reference detected: %s -> %s' % (self.cdist_object.name, self.required_object.name) - - class RequirementNotFoundError(cdist.Error): def __init__(self, requirement): self.requirement = requirement