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

include type name in error message

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-14 11:49:37 +02:00
parent f285d9e64e
commit 1c84e423d1
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/cdist/core/object.py
View file

@ -34,12 +34,13 @@ DOT_CDIST = '.cdist'
class IllegalObjectIdError(cdist.Error): class IllegalObjectIdError(cdist.Error):
def __init__(self, object_id, message=None): def __init__(self, object_id, type_name, message=None):
self.object_id = object_id self.object_id = object_id
self.type_name = type_name
self.message = message or 'Illegal object id' self.message = message or 'Illegal object id'
def __str__(self): def __str__(self):
return '%s: %s' % (self.message, self.object_id) return '%s: %s' % (self.message, os.path.join(self.type_name. self.object_id))
class Object(object): class Object(object):
@ -89,7 +90,7 @@ class Object(object):
def __init__(self, cdist_type, base_path, object_id=None): def __init__(self, cdist_type, base_path, object_id=None):
if object_id and object_id.startswith('/'): if object_id and object_id.startswith('/'):
raise IllegalObjectIdError(object_id, 'object_id may not start with /') raise IllegalObjectIdError(object_id, cdist_type.name, 'object_id may not start with /')
self.type = cdist_type # instance of Type self.type = cdist_type # instance of Type
self.base_path = base_path self.base_path = base_path
self.object_id = object_id self.object_id = object_id

4
lib/cdist/emulator.py
View file

@ -116,9 +116,9 @@ def run(argv):
# no object id, must be singleton # no object id, must be singleton
requirement_object_id = 'singleton' requirement_object_id = 'singleton'
if requirement_object_id.startswith('/'): if requirement_object_id.startswith('/'):
raise core.IllegalObjectIdError(requirement_object_id, 'object_id may not start with /') raise core.IllegalObjectIdError(requirement_object_id, requirement_type_name, 'object_id may not start with /')
log.debug("Recording requirement: %s -> %s" % (cdist_object.path, requirement)) log.debug("Recording requirement: %s -> %s" % (cdist_object.path, requirement))
cdist_object.requirements.append(rement_object_id) cdist_object.requirements.append(requirement)
# Record / Append source # Record / Append source
cdist_object.source.append(object_source) cdist_object.source.append(object_source)