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

fix shell from previous context change

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2013-09-03 21:32:26 +02:00
commit a4151fee44
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cdist/shell.py
View file

@ -38,11 +38,8 @@ class Shell(object):
self.shell = shell
self.target_host = "cdist-shell-no-target-host"
self.local = cdist.local.Local(
target_host=self.target_host,
remote_copy=cdist.REMOTE_COPY,
remote_exec=cdist.REMOTE_EXEC)
self.local = cdist.exec.local.Local(
target_host=self.target_host)
def _init_shell(self):
"""Select shell to execute, if not specified by user"""
@ -62,7 +59,7 @@ class Shell(object):
'PATH': "%s:%s" % (self.local.bin_path, os.environ['PATH']),
'__cdist_type_base_path': self.local.type_path, # for use in type emulator
'__cdist_manifest': "cdist shell",
'__global': self.local.out_path,
'__global': self.local.base_path,
'__target_host': self.target_host,
'__manifest': self.local.manifest_path,
'__explorer': self.local.global_explorer_path,