KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show the output from failed ssh commands

Browse Source
This commit is contained in:
Kovid Goyal 2022-02-08 10:46:34 +05:30
parent 141c814d72
commit c9da734c0e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kittens/remote_file/main.py
View File

@ -122,10 +122,17 @@ class ControlMaster:
cmd.extend(['-i', conn_data.identity_file]) cmd.extend(['-i', conn_data.identity_file])
self.batch_cmd_prefix = cmd + ['-o', 'BatchMode=yes'] self.batch_cmd_prefix = cmd + ['-o', 'BatchMode=yes']
def check_call(self, cmd: List[str]) -> None:
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.DEVNULL)
stdout = p.communicate()[0]
if p.wait() != 0:
out = stdout.decode('utf-8', 'replace')
raise Exception(f'The ssh command: {shlex.join(cmd)} failed with exit code {p.returncode} and output: {out}')
def __enter__(self) -> 'ControlMaster': def __enter__(self) -> 'ControlMaster':
subprocess.check_call( self.check_call(
self.cmd_prefix + ['-o', 'ControlMaster=auto', '-fN', self.conn_data.hostname]) self.cmd_prefix + ['-o', 'ControlMaster=auto', '-fN', self.conn_data.hostname])
subprocess.check_call( self.check_call(
self.batch_cmd_prefix + ['-O', 'check', self.conn_data.hostname]) self.batch_cmd_prefix + ['-O', 'check', self.conn_data.hostname])
if not self.dest: if not self.dest:
self.tdir = tempfile.mkdtemp() self.tdir = tempfile.mkdtemp()