diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-09-22 17:21:24 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-23 09:53:14 +0100 |
commit | ae788fbd46f8a83d4c1776eeb4457ed5bb61915f (patch) | |
tree | 409a44ee48ca6b70d7bc26ea9ae3354063f82899 /scripts/lib/devtool/package.py | |
parent | 99cd79d8be25c9dca232c3c197b09ea3961ad729 (diff) | |
download | poky-ae788fbd46f8a83d4c1776eeb4457ed5bb61915f.tar.gz |
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.
(From OE-Core rev: 0c3f289576a2ab35b1d1d8854d6763553cc3bf09)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/package.py')
-rw-r--r-- | scripts/lib/devtool/package.py | 6 |
1 files changed, 2 insertions, 4 deletions
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 | |||
20 | import subprocess | 20 | import subprocess |
21 | import logging | 21 | import logging |
22 | from bb.process import ExecutionError | 22 | from bb.process import ExecutionError |
23 | from devtool import exec_build_env_command, setup_tinfoil, DevtoolError | 23 | from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, DevtoolError |
24 | 24 | ||
25 | logger = logging.getLogger('devtool') | 25 | logger = logging.getLogger('devtool') |
26 | 26 | ||
@@ -30,9 +30,7 @@ def plugin_init(pluginlist): | |||
30 | 30 | ||
31 | def package(args, config, basepath, workspace): | 31 | def package(args, config, basepath, workspace): |
32 | """Entry point for the devtool 'package' subcommand""" | 32 | """Entry point for the devtool 'package' subcommand""" |
33 | if not args.recipename in workspace: | 33 | check_workspace_recipe(workspace, args.recipename) |
34 | raise DevtoolError("no recipe named %s in your workspace" % | ||
35 | args.recipename) | ||
36 | 34 | ||
37 | image_pkgtype = config.get('Package', 'image_pkgtype', '') | 35 | image_pkgtype = config.get('Package', 'image_pkgtype', '') |
38 | if not image_pkgtype: | 36 | if not image_pkgtype: |