From 0c3f289576a2ab35b1d1d8854d6763553cc3bf09 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 22 Sep 2015 17:21:24 +0100 Subject: devtool: check that source tree still exists Sometimes, particularly if you extracted the source to /tmp which is on tmpfs, the external source tree that is being pointed to may no longer exist when you come to run "devtool build" or "devtool update-recipe" etc. Make all of the commands that need to check for a recipe being in the workspace call a single function and have that function additionally check the source tree still exists where appropriate. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/lib/devtool/package.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'scripts/lib/devtool/package.py') diff --git a/scripts/lib/devtool/package.py b/scripts/lib/devtool/package.py index 3a7a36b600..28ecfed7a7 100644 --- a/scripts/lib/devtool/package.py +++ b/scripts/lib/devtool/package.py @@ -20,7 +20,7 @@ import os import subprocess import logging from bb.process import ExecutionError -from devtool import exec_build_env_command, setup_tinfoil, DevtoolError +from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, DevtoolError logger = logging.getLogger('devtool') @@ -30,9 +30,7 @@ def plugin_init(pluginlist): def package(args, config, basepath, workspace): """Entry point for the devtool 'package' subcommand""" - if not args.recipename in workspace: - raise DevtoolError("no recipe named %s in your workspace" % - args.recipename) + check_workspace_recipe(workspace, args.recipename) image_pkgtype = config.get('Package', 'image_pkgtype', '') if not image_pkgtype: -- cgit 1.2.3-korg