From: "Liu, Yong" <yong.liu@intel.com>
To: "Xu, GangX" <gangx.xu@intel.com>, "dts@dpdk.org" <dts@dpdk.org>
Cc: "Xu, GangX" <gangx.xu@intel.com>
Subject: Re: [dts] [PATCH V1] fix scp error on FreeBSD
Date: Tue, 25 Oct 2016 06:36:21 +0000 [thread overview]
Message-ID: <86228AFD5BCD8E4EBFD2B90117B5E81E60309014@SHSMSX103.ccr.corp.intel.com> (raw)
In-Reply-To: <1477376546-2506-1-git-send-email-gangx.xu@intel.com>
Hi Gang,
I think code [pP] can just fix this issue. All you need is that change the first line as second line.
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of xu,gang
> Sent: Tuesday, October 25, 2016 2:22 PM
> To: dts@dpdk.org
> Cc: Xu, GangX
> Subject: [dts] [PATCH V1] fix scp error on FreeBSD
>
> when scp something to FreeBSD the prompt is different with other
> ex:FreeBSD is "Password for root@freeBSD:"
> Fedora is "root@xx.xxx.xxx.xxx's password:"
>
> Signed-off-by: xu,gang <gangx.xu@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..7bad5f5 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, '.*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, '.*ssword', pexpect.EOF], 2)
>
> if i == 1:
> time.sleep(0.5)
> --
> 1.9.3
prev parent reply other threads:[~2016-10-25 6:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-25 6:22 xu,gang
2016-10-25 6:36 ` Liu, Yong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86228AFD5BCD8E4EBFD2B90117B5E81E60309014@SHSMSX103.ccr.corp.intel.com \
--to=yong.liu@intel.com \
--cc=dts@dpdk.org \
--cc=gangx.xu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).