[dts] [PATCH V2] fix scp error on FreeBSD

Liu, Yong yong.liu at intel.com
Wed Oct 26 09:41:13 CEST 2016


Thanks, gang. Applied.

On 10/25/2016 02:47 PM, xu,gang wrote:
> when scp something to FreeBSD the prompt is different with other
> ex:FreeBSD is "Password for root at freeBSD:"
> Fedora is "root at xx.xxx.xxx.xxx's password:"
>
>
> Signed-off-by: xu,gang <gangx.xu at intel.com>
> ---
>   framework/ssh_pexpect.py | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/framework/ssh_pexpect.py b/framework/ssh_pexpect.py
> index 1abf8a1..9668daf 100644
> --- a/framework/ssh_pexpect.py
> +++ b/framework/ssh_pexpect.py
> @@ -176,11 +176,11 @@ class SSHPexpect(object):
>           p = pexpect.spawn(scp_cmd)
>           time.sleep(0.5)
>           ssh_newkey = 'Are you sure you want to continue connecting'
> -        i = p.expect([ssh_newkey, 'password: ', "# ", pexpect.EOF,
> +        i = p.expect([ssh_newkey, '[pP]ssword', "# ", pexpect.EOF,
>                         pexpect.TIMEOUT], 120)
>           if i == 0:  # add once in trust list
>               p.sendline('yes')
> -            i = p.expect([ssh_newkey, '[pP]assword: ', pexpect.EOF], 2)
> +            i = p.expect([ssh_newkey, '[pP]ssword', pexpect.EOF], 2)
>   
>           if i == 1:
>               time.sleep(0.5)



More information about the dts mailing list