Merge branch 'enhance_cache'
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> Conflicts: cdist/test/code/__init__.py cdist/test/config_install/__init__.py cdist/test/explorer/__init__.py
This commit is contained in:
commit
e6feee14fb
12 changed files with 87 additions and 67 deletions
|
|
@ -28,6 +28,15 @@ import sys
|
|||
import cdist
|
||||
from cdist import core
|
||||
|
||||
class MissingRequiredEnvironmentVariableError(cdist.Error):
|
||||
def __init__(self, name):
|
||||
self.name = name
|
||||
self.message = "Emulator requires the environment variable %s to be setup" % self.name
|
||||
|
||||
def __str__(self):
|
||||
return self.message
|
||||
|
||||
|
||||
class Emulator(object):
|
||||
def __init__(self, argv, stdin=sys.stdin.buffer, env=os.environ):
|
||||
self.argv = argv
|
||||
|
|
@ -36,12 +45,16 @@ class Emulator(object):
|
|||
|
||||
self.object_id = ''
|
||||
|
||||
self.global_path = self.env['__global']
|
||||
self.target_host = self.env['__target_host']
|
||||
try:
|
||||
self.global_path = self.env['__global']
|
||||
self.target_host = self.env['__target_host']
|
||||
|
||||
# Internally only
|
||||
self.object_source = self.env['__cdist_manifest']
|
||||
self.type_base_path = self.env['__cdist_type_base_path']
|
||||
# Internally only
|
||||
self.object_source = self.env['__cdist_manifest']
|
||||
self.type_base_path = self.env['__cdist_type_base_path']
|
||||
|
||||
except KeyError as e:
|
||||
raise MissingRequiredEnvironmentVariableError(e.args[0])
|
||||
|
||||
self.object_base_path = os.path.join(self.global_path, "object")
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue