This is an automated email from the git hooks/post-receive script.
unknown user pushed a commit to branch linaro in repository dejagnu.
The following commit(s) were added to refs/heads/linaro by this push: new fe9ff36 Work around problem with ControlPersist and SCP. fe9ff36 is described below
commit fe9ff36a65103bca72c54d0ed9d9f7ae4fa12815 Author: Maxim Kuvyrkov maxim.kuvyrkov@linaro.org Date: Wed Aug 5 09:24:44 2015 -0600
Work around problem with ControlPersist and SCP. --- ChangeLog | 12 ++++++++++++ lib/rsh.exp | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 62b5eff..5a3a136 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2015-08-05 Maxim Kuvyrkov maxim.kuvyrkov@linaro.org + + * The current workaround for ControlMaster keeping ssh process + alive is causing "ssh $target rm -f" to be executed AFTER + following "scp" command, thus creating an illusion of scp never + happenning. Since we are now using ControlPersist (which creates + master connection as a stand-alone process) the workaround is no + longer necessary. + + Since we (Linaro TCWG) use ssh, this patch just removes "ssh rm + -f", since scp will overwrite the file, if one is present. + 2015-07-30 Pedro Alves palves@redhat.com
* lib/remote.exp (close_wait_program): New procedure. diff --git a/lib/rsh.exp b/lib/rsh.exp index 57b071d..c5c653c 100644 --- a/lib/rsh.exp +++ b/lib/rsh.exp @@ -194,8 +194,6 @@ proc rsh_download {desthost srcfile destfile} { set desthost [board_info $desthost hostname] }
- # rm has no output, which causes problems with ssh using ControlMaster - set status [catch "exec $RSH $rsh_port $rsh_useropts $rcp_user$desthost rm -f [...] set status [catch "exec $RCP $rcp_port $srcfile $rcp_user$desthost:$destfile | [...] if { $status == 0 } { verbose "Copied $srcfile to $desthost:$destfile" 2