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

raise IllegalRequirementError if requirements object_id starts with a /

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-14 15:52:53 +02:00
commit 1e622f9128
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/cdist/emulator.py
View file

@ -28,6 +28,16 @@ from cdist import core
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class IllegalRequirementError(cdist.Error):
def __init__(self, requirement, message=None):
self.requirement = requirement
self.message = message or 'Illegal requirement'
def __str__(self):
return '%s: %s' % (self.message, self.requirement)
def run(argv): def run(argv):
"""Emulate type commands (i.e. __file and co)""" """Emulate type commands (i.e. __file and co)"""
global_path = os.environ['__global'] global_path = os.environ['__global']
@ -116,7 +126,7 @@ 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, requirement_type_name, 'object_id may not start with /') raise IllegalRequirementError(requirement, 'requirements 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(requirement) cdist_object.requirements.append(requirement)