MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

devtool: deploy-target: don't specify ssh/scp port unless user does

Browse Source 
If the user doesn't specify a port then we should avoid specifying one
on the ssh/scp command line in case the user has configured one for the
host they are connecting to, which was being overridden unnecessarily.

Fixes [YOCTO #12381].

(From OE-Core rev: f1020eef09fada7ef2231d5528576553f3f6bfe1)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2018-02-26 14:49:58 +13:00 committed by Richard Purdie
parent 0465558e83
commit 3bb00af9ab
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/lib/devtool/deploy.py
View File

@ -213,9 +213,7 @@ def deploy(args, config, basepath, workspace):
scp_port = ''
ssh_port = ''
if not args.port:
raise DevtoolError("If you specify -P/--port then you must provide the port to be used to connect to the target")
else:
if args.port:
scp_port = "-P %s" % args.port
ssh_port = "-p %s" % args.port
@ -280,9 +278,7 @@ def undeploy(args, config, basepath, workspace):
scp_port = ''
ssh_port = ''
if not args.port:
raise DevtoolError("If you specify -P/--port then you must provide the port to be used to connect to the target")
else:
if args.port:
scp_port = "-P %s" % args.port
ssh_port = "-p %s" % args.port
@ -328,7 +324,7 @@ def register_commands(subparsers, context):
parser_deploy.add_argument('-n', '--dry-run', help='List files to be deployed only', action='store_true')
parser_deploy.add_argument('-p', '--no-preserve', help='Do not preserve existing files', action='store_true')
parser_deploy.add_argument('--no-check-space', help='Do not check for available space before deploying', action='store_true')
parser_deploy.add_argument('-P', '--port', default='22', help='Port to use for connection to the target')
parser_deploy.add_argument('-P', '--port', help='Specify port to use for connection to the target')
strip_opts = parser_deploy.add_mutually_exclusive_group(required=False)
strip_opts.add_argument('-S', '--strip',
@ -350,5 +346,5 @@ def register_commands(subparsers, context):
parser_undeploy.add_argument('-s', '--show-status', help='Show progress/status output', action='store_true')
parser_undeploy.add_argument('-a', '--all', help='Undeploy all recipes deployed on the target', action='store_true')
parser_undeploy.add_argument('-n', '--dry-run', help='List files to be undeployed only', action='store_true')
parser_undeploy.add_argument('-P', '--port', default='22', help='Port to use for connection to the target')
parser_undeploy.add_argument('-P', '--port', help='Specify port to use for connection to the target')
parser_undeploy.set_defaults(func=undeploy)