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

remove context from shell

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2013-08-19 00:38:19 +02:00
commit b9a6cf7c6a
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cdist/shell.py
View file

@ -24,7 +24,7 @@ import os
import subprocess import subprocess
# initialise cdist # initialise cdist
import cdist.context import cdist.exec.local
# FIXME: only considering config here - enable # FIXME: only considering config here - enable
@ -41,7 +41,7 @@ class Shell(object):
self.shell = shell self.shell = shell
self.target_host = "cdist-shell-no-target-host" self.target_host = "cdist-shell-no-target-host"
self.context = cdist.context.Context( self.local = cdist.local.Local(
target_host=self.target_host, target_host=self.target_host,
remote_copy=cdist.REMOTE_COPY, remote_copy=cdist.REMOTE_COPY,
remote_exec=cdist.REMOTE_EXEC) remote_exec=cdist.REMOTE_EXEC)
@ -57,18 +57,18 @@ class Shell(object):
self.shell = "/bin/sh" self.shell = "/bin/sh"
def _init_files_dirs(self): def _init_files_dirs(self):
self.context.local.create_files_dirs() self.local.create_files_dirs()
def _init_environment(self): def _init_environment(self):
self.env = os.environ.copy() self.env = os.environ.copy()
additional_env = { additional_env = {
'PATH': "%s:%s" % (self.context.local.bin_path, os.environ['PATH']), 'PATH': "%s:%s" % (self.local.bin_path, os.environ['PATH']),
'__cdist_type_base_path': self.context.local.type_path, # for use in type emulator '__cdist_type_base_path': self.local.type_path, # for use in type emulator
'__cdist_manifest': "cdist shell", '__cdist_manifest': "cdist shell",
'__global': self.context.local.out_path, '__global': self.local.out_path,
'__target_host': self.target_host, '__target_host': self.target_host,
'__manifest': self.context.local.manifest_path, '__manifest': self.local.manifest_path,
'__explorer': self.context.local.global_explorer_path, '__explorer': self.local.global_explorer_path,
} }
self.env.update(additional_env) self.env.update(additional_env)
@ -79,7 +79,7 @@ class Shell(object):
self._init_environment() self._init_environment()
log.info("Starting shell...") log.info("Starting shell...")
self.context.local.run([self.shell], self.env) self.local.run([self.shell], self.env)
log.info("Finished shell.") log.info("Finished shell.")
@classmethod @classmethod