mirror of
ssh://git.janware.com/janware/proj/jw-pkg
synced 2026-04-24 09:13:37 +02:00
lib.ec.ssh.Paramiko: Support Caps.Env
Add support for modifying the execution environment via the env parameter to Paramiko. Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
9dd7c18803
commit
2851ef8f42
1 changed files with 25 additions and 4 deletions
|
|
@ -12,8 +12,13 @@ from .util import join_cmd
|
||||||
|
|
||||||
class Paramiko(Base):
|
class Paramiko(Base):
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs) -> None:
|
def __init__(self, uri, *args, **kwargs) -> None:
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(
|
||||||
|
uri,
|
||||||
|
*args,
|
||||||
|
caps = self.Caps.Env,
|
||||||
|
**kwargs
|
||||||
|
)
|
||||||
self.__timeout: float|None = None # Untested
|
self.__timeout: float|None = None # Untested
|
||||||
self.___ssh: Any|None = None
|
self.___ssh: Any|None = None
|
||||||
|
|
||||||
|
|
@ -44,9 +49,25 @@ class Paramiko(Base):
|
||||||
def __scp(self):
|
def __scp(self):
|
||||||
return SCPClient(self.__ssh.get_transport())
|
return SCPClient(self.__ssh.get_transport())
|
||||||
|
|
||||||
async def _run_ssh(self, cmd: list[str], cmd_input: bytes|None, *args, **kwargs) -> Result:
|
async def _run_ssh(
|
||||||
|
self,
|
||||||
|
cmd: list[str],
|
||||||
|
wd: str | None,
|
||||||
|
verbose: bool,
|
||||||
|
cmd_input: str | None,
|
||||||
|
env: dict[str, str] | None,
|
||||||
|
interactive: bool,
|
||||||
|
log_prefix: str,
|
||||||
|
) -> Result:
|
||||||
try:
|
try:
|
||||||
stdin, stdout, stderr = self.__ssh.exec_command(join_cmd(cmd), timeout=self.__timeout)
|
kwargs: [str, Any] = {}
|
||||||
|
if env is not None:
|
||||||
|
kwargs['environment'] = env
|
||||||
|
stdin, stdout, stderr = self.__ssh.exec_command(
|
||||||
|
join_cmd(cmd),
|
||||||
|
timeout=self.__timeout,
|
||||||
|
**kwargs,
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log(ERR, f'Command failed for {self.uri}: "{join_cmd(cmd)}"')
|
log(ERR, f'Command failed for {self.uri}: "{join_cmd(cmd)}"')
|
||||||
raise
|
raise
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue