forked from ungleich-public/cdist
export __target_host for use in __remote_{copy,exec} scripts
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
parent
654e19f28b
commit
98dec302a6
1 changed files with 13 additions and 2 deletions
|
@ -95,6 +95,12 @@ class Local(object):
|
|||
"""
|
||||
assert isinstance(command, (list, tuple)), "list or tuple argument expected, got: %s" % command
|
||||
self.log.debug("Local run: %s", command)
|
||||
|
||||
if env is None:
|
||||
env = {}
|
||||
# Export __target_host for use in __remote_{copy,exec} scripts
|
||||
env['__target_host'] = self.target_host
|
||||
|
||||
try:
|
||||
if return_output:
|
||||
return subprocess.check_output(command, env=env).decode()
|
||||
|
@ -114,7 +120,12 @@ class Local(object):
|
|||
command.append(script)
|
||||
|
||||
self.log.debug("Local run script: %s", command)
|
||||
if env:
|
||||
|
||||
if env is None:
|
||||
env = {}
|
||||
# Export __target_host for use in __remote_{copy,exec} scripts
|
||||
env['__target_host'] = self.target_host
|
||||
|
||||
self.log.debug("Local run script env: %s", env)
|
||||
|
||||
try:
|
||||
|
|
Loading…
Reference in a new issue