Commit44c5fac

authored

Merge pull request#169 from dmitry-lipetsk/D20241224_003--ssh_command_line

Ssh command line in RemoteOperations::execute is corrected

2 parents3224e21 +3ca3ff7 commit44c5facCopy full SHA for 44c5fac

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1125,10 +1125,7 @@ def _psql(`
`1125`	`1125`
`1126`	`1126`	`# select query source`
`1127`	`1127`	`ifquery:`
`1128`		`-ifself.os_ops.remote:`
`1129`		`-psql_params.extend(("-c",'"{}"'.format(query)))`
`1130`		`-else:`
`1131`		`-psql_params.extend(("-c",query))`
	`1128`	`+psql_params.extend(("-c",query))`
`1132`	`1129`	`eliffilename:`
`1133`	`1130`	`psql_params.extend(("-f",filename))`
`1134`	`1131`	`else:`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,10 @@ def exec_command(self, cmd, wait_exit=False, verbose=False, expect_error=False,`
`80`	`80`	`ifisinstance(cmd,str):`
`81`	`81`	`ssh_cmd= ['ssh',self.ssh_dest]+self.ssh_args+ [cmd]`
`82`	`82`	`elifisinstance(cmd,list):`
`83`		`-ssh_cmd= ['ssh',self.ssh_dest]+self.ssh_args+cmd`
	`83`	`+ssh_cmd= ['ssh',self.ssh_dest]+self.ssh_args+ [subprocess.list2cmdline(cmd)]`
	`84`	`+else:`
	`85`	`+raiseValueError("Invalid 'cmd' argument type - {0}".format(type(cmd).__name__))`
	`86`	`+`
`84`	`87`	`process=subprocess.Popen(ssh_cmd,stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE)`
`85`	`88`	`assertnot (processisNone)`
`86`	`89`	`ifget_process:`

Comments

(0)