[OE-core] [PATCH 11/11] devtool: deploy plugin: wrap long lines in code
Markus Lehtonen
markus.lehtonen at linux.intel.com
Mon May 11 13:17:11 UTC 2015
Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>
---
scripts/lib/devtool/deploy.py | 99 +++++++++++++++++++++++++++++++------------
1 file changed, 72 insertions(+), 27 deletions(-)
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index 078c74b..f6ae433 100644
--- a/scripts/lib/devtool/deploy.py
+++ b/scripts/lib/devtool/deploy.py
@@ -45,17 +45,23 @@ def deploy(args, config, basepath, workspace):
deploy_dir = os.path.join(basepath, 'target_deploy', args.target)
deploy_file = os.path.join(deploy_dir, args.recipename + '.list')
- stdout, _ = exec_build_env_command(config.init_path, basepath, 'bitbake -e %s' % args.recipename, shell=True)
+ stdout, _ = exec_build_env_command(config.init_path, basepath,
+ 'bitbake -e %s' % args.recipename,
+ shell=True)
recipe_outdir = re.search(r'^D="(.*)"', stdout, re.MULTILINE).group(1)
if not os.path.exists(recipe_outdir) or not os.listdir(recipe_outdir):
- logger.error('No files to deploy - have you built the %s recipe? If so, the install step has not installed any files.' % args.recipename)
+ logger.error('No files to deploy - have you built the %s recipe? If '
+ 'so, the install step has not installed any files.' %
+ args.recipename)
return -1
if args.dry_run:
- print('Files to be deployed for %s on target %s:' % (args.recipename, args.target))
+ print('Files to be deployed for %s on target %s:' %
+ (args.recipename, args.target))
for root, _, files in os.walk(recipe_outdir):
for fn in files:
- print(' %s' % os.path.join(destdir, os.path.relpath(root, recipe_outdir), fn))
+ print(' %s' % os.path.join(
+ destdir, os.path.relpath(root, recipe_outdir), fn))
return 0
if os.path.exists(deploy_file):
@@ -65,12 +71,16 @@ def deploy(args, config, basepath, workspace):
extraoptions = ''
if args.no_host_check:
- extraoptions += '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
+ extraoptions += '-o UserKnownHostsFile=/dev/null'
+ extraoptions += ' -o StrictHostKeyChecking=no'
if not args.show_status:
extraoptions += ' -q'
- ret = subprocess.call('scp -r %s %s/* %s:%s' % (extraoptions, recipe_outdir, args.target, destdir), shell=True)
+ ret = subprocess.call('scp -r %s %s/* %s:%s' %
+ (extraoptions, recipe_outdir, args.target, destdir),
+ shell=True)
if ret != 0:
- logger.error('Deploy failed - rerun with -s to get a complete error message')
+ logger.error('Deploy failed - rerun with -s to get a complete error '
+ 'message')
return ret
logger.info('Successfully deployed %s' % recipe_outdir)
@@ -81,7 +91,8 @@ def deploy(args, config, basepath, workspace):
files_list = []
for root, _, files in os.walk(recipe_outdir):
for filename in files:
- filename = os.path.relpath(os.path.join(root, filename), recipe_outdir)
+ filename = os.path.relpath(os.path.join(root, filename),
+ recipe_outdir)
files_list.append(os.path.join(destdir, filename))
with open(deploy_file, 'w') as fobj:
@@ -91,13 +102,15 @@ def deploy(args, config, basepath, workspace):
def undeploy(args, config, basepath, workspace):
"""Entry point for the devtool 'undeploy' subcommand"""
- deploy_file = os.path.join(basepath, 'target_deploy', args.target, args.recipename + '.list')
+ deploy_file = os.path.join(basepath, 'target_deploy', args.target,
+ args.recipename + '.list')
if not os.path.exists(deploy_file):
logger.error('%s has not been deployed' % args.recipename)
return -1
if args.dry_run:
- print('Previously deployed files to be un-deployed for %s on target %s:' % (args.recipename, args.target))
+ print('Previously deployed files to be un-deployed for %s on target '
+ '%s:' % (args.recipename, args.target))
with open(deploy_file, 'r') as f:
for line in f:
print(' %s' % line.rstrip())
@@ -105,39 +118,71 @@ def undeploy(args, config, basepath, workspace):
extraoptions = ''
if args.no_host_check:
- extraoptions += '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
+ extraoptions += '-o UserKnownHostsFile=/dev/null '
+ extraoptions += ' -o StrictHostKeyChecking=no'
if not args.show_status:
extraoptions += ' -q'
- ret = subprocess.call("scp %s %s %s:/tmp" % (extraoptions, deploy_file, args.target), shell=True)
+ ret = subprocess.call("scp %s %s %s:/tmp" %
+ (extraoptions, deploy_file, args.target), shell=True)
if ret != 0:
- logger.error('Failed to copy file list to %s - rerun with -s to get a complete error message' % args.target)
+ logger.error('Failed to copy file list to %s - rerun with -s to get a '
+ 'complete error message' % args.target)
return -1
- ret = subprocess.call("ssh %s %s 'xargs -n1 rm -f </tmp/%s'" % (extraoptions, args.target, os.path.basename(deploy_file)), shell=True)
+ ret = subprocess.call(
+ "ssh %s %s 'xargs -n1 rm -f </tmp/%s'" %
+ (extraoptions, args.target, os.path.basename(deploy_file)),
+ shell=True)
if ret == 0:
logger.info('Successfully undeployed %s' % args.recipename)
os.remove(deploy_file)
else:
- logger.error('Undeploy failed - rerun with -s to get a complete error message')
+ logger.error('Undeploy failed - rerun with -s to get a complete error '
+ 'message')
return ret
def register_commands(subparsers, context):
"""Register devtool subcommands from the deploy plugin"""
- parser_deploy = subparsers.add_parser('deploy-target', help='Deploy recipe output files to live target machine')
- parser_deploy.add_argument('recipename', help='Recipe to deploy')
- parser_deploy.add_argument('target', help='Live target machine running an ssh server: user at hostname[:destdir]')
- parser_deploy.add_argument('-c', '--no-host-check', help='Disable ssh host key checking', action='store_true')
- parser_deploy.add_argument('-s', '--show-status', help='Show progress/status output', action='store_true')
- parser_deploy.add_argument('-n', '--dry-run', help='List files to be deployed only', action='store_true')
+ parser_deploy = subparsers.add_parser(
+ 'deploy-target',
+ help='Deploy recipe output files to live target machine')
+ parser_deploy.add_argument(
+ 'recipename',
+ help='Recipe to deploy')
+ parser_deploy.add_argument(
+ 'target',
+ help='Live target machine running an ssh server: '
+ 'user at hostname[:destdir]')
+ parser_deploy.add_argument(
+ '-c', '--no-host-check',
+ help='Disable ssh host key checking', action='store_true')
+ parser_deploy.add_argument(
+ '-s', '--show-status',
+ help='Show progress/status output', action='store_true')
+ parser_deploy.add_argument(
+ '-n', '--dry-run',
+ help='List files to be deployed only', action='store_true')
parser_deploy.set_defaults(func=deploy)
- parser_undeploy = subparsers.add_parser('undeploy-target', help='Undeploy recipe output files in live target machine')
- parser_undeploy.add_argument('recipename', help='Recipe to undeploy')
- parser_undeploy.add_argument('target', help='Live target machine running an ssh server: user at hostname')
- parser_undeploy.add_argument('-c', '--no-host-check', help='Disable ssh host key checking', action='store_true')
- parser_undeploy.add_argument('-s', '--show-status', help='Show progress/status output', action='store_true')
- parser_undeploy.add_argument('-n', '--dry-run', help='List files to be undeployed only', action='store_true')
+ parser_undeploy = subparsers.add_parser(
+ 'undeploy-target',
+ help='Undeploy recipe output files in live target machine')
+ parser_undeploy.add_argument(
+ 'recipename',
+ help='Recipe to undeploy')
+ parser_undeploy.add_argument(
+ 'target',
+ help='Live target machine running an ssh server: user at hostname')
+ parser_undeploy.add_argument(
+ '-c', '--no-host-check',
+ help='Disable ssh host key checking', action='store_true')
+ parser_undeploy.add_argument(
+ '-s', '--show-status',
+ help='Show progress/status output', action='store_true')
+ parser_undeploy.add_argument(
+ '-n', '--dry-run',
+ help='List files to be undeployed only', action='store_true')
parser_undeploy.set_defaults(func=undeploy)
--
2.1.4
More information about the Openembedded-core
mailing list