stephan/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

record the type name, if there is no such type

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2013-09-02 11:30:22 +02:00
commit 73338c330b
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cdist/core/cdist_type.py
View file

@ -25,7 +25,8 @@ import os
import cdist import cdist
class NoSuchTypeError(cdist.Error): class NoSuchTypeError(cdist.Error):
def __init__(self, type_path, type_absolute_path): def __init__(self, name, type_path, type_absolute_path):
self.name = name
self.type_path = type_path self.type_path = type_path
self.type_absolute_path = type_absolute_path self.type_absolute_path = type_absolute_path
@ -48,7 +49,7 @@ class CdistType(object):
self.path = self.name self.path = self.name
self.absolute_path = os.path.join(self.base_path, self.path) self.absolute_path = os.path.join(self.base_path, self.path)
if not os.path.isdir(self.absolute_path): if not os.path.isdir(self.absolute_path):
raise NoSuchTypeError(self.path, self.absolute_path) raise NoSuchTypeError(self.name, self.path, self.absolute_path)
self.manifest_path = os.path.join(self.name, "manifest") self.manifest_path = os.path.join(self.name, "manifest")
self.explorer_path = os.path.join(self.name, "explorer") self.explorer_path = os.path.join(self.name, "explorer")
self.gencode_local_path = os.path.join(self.name, "gencode-local") self.gencode_local_path = os.path.join(self.name, "gencode-local")

4
cdist/emulator.py
View file

@ -177,8 +177,8 @@ class Emulator(object):
# Raises an error, if object cannot be created # Raises an error, if object cannot be created
try: try:
cdist_object = self.cdist_object.object_from_name(requirement) cdist_object = self.cdist_object.object_from_name(requirement)
except core.cdist_type.NoSuchTypeError: except core.cdist_type.NoSuchTypeError as e:
self.log.error("%s requires object %s with non-existing type at %s" % (self.cdist_object.name, requirement, self.object_source)) self.log.error("%s requires object %s, but type %s does not exist (definded at %s)" % (self.cdist_object.name, requirement, e.name, self.object_source))
raise raise