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

fails if requirement has illegal object_id

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-18 14:50:28 +02:00
parent 2a5465c03c
commit 2246b7496b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/cdist/emulator.py
View file

@ -158,9 +158,6 @@ class Emulator(object):
requirement_type_name = requirement_parts[0] requirement_type_name = requirement_parts[0]
requirement_object_id = requirement_parts[1] requirement_object_id = requirement_parts[1]
# Instantiate type which fails if type does not exist
requirement_type = core.Type(self.type_base_path, requirement_type_name)
# FIXME: Add support for omitted object id == singleton # FIXME: Add support for omitted object id == singleton
#if len(requirement_parts) == 1: #if len(requirement_parts) == 1:
#except IndexError: #except IndexError:
@ -170,6 +167,11 @@ class Emulator(object):
# Remove / if existent in object id # Remove / if existent in object id
requirement_object_id = requirement_object_id.lstrip('/') requirement_object_id = requirement_object_id.lstrip('/')
# Instantiate type which fails if type does not exist
requirement_type = core.Type(self.type_base_path, requirement_type_name)
# Instantiate object which fails if the object_id is illegal
requirement_object = core.Object(requirement_type, self.object_base_path, requirement_object_id)
# Construct cleaned up requirement with only one / :-) # Construct cleaned up requirement with only one / :-)
requirement = requirement_type_name + '/' + requirement_object_id requirement = requirement_type_name + '/' + requirement_object_id
self.cdist_object.requirements.append(requirement) self.cdist_object.requirements.append(requirement)