fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

back to 100% tests working

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-02-12 01:27:25 +01:00
commit 91ecfa7d3f
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/cdist/emulator.py
View file

@ -41,14 +41,16 @@ class Emulator(object):
self.object_id = False
self.global_path = os.environ['__global']
self.object_source = os.environ['__cdist_manifest']
self.target_host = os.environ['__target_host']
# Internally only
self.object_source = os.environ['__cdist_manifest']
self.type_base_path = os.environ['__cdist_type_base_path']
self.object_base_path = os.path.join(self.global_path, "object")
self.type_name = os.path.basename(argv[0])
self.cdist_type = core.Type(self.type_base_path, self.type_name)
self.cdist_type = core.CdistType(self.type_base_path, self.type_name)
self.__init_log()
@ -156,7 +158,7 @@ class Emulator(object):
requirement_type_name, requirement_object_id = core.CdistObject.split_name(requirement)
# Instantiate type which fails if type does not exist
requirement_type = core.Type(self.type_base_path, requirement_type_name)
requirement_type = core.CdistType(self.type_base_path, requirement_type_name)
if requirement_object_id:
# Validate object_id if any