summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-10-14 16:43:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-19 17:57:58 +0100
commit5a02ec217d6c67db9dedf39d63cec504b87506b2 (patch)
tree776a747046d3fb052759d573c8be433e46bf097c
parent3aac11076e22ac4fea48f5404110bb959547a9fe (diff)
downloadpoky-5a02ec217d6c67db9dedf39d63cec504b87506b2.tar.gz
devtool: extract: fix error handling
If recipe parsing fails we need to exit out instead of attempting to use the data object that's set to None, which resulted in a traceback. (From OE-Core rev: a46fb1a06be2df00a0bceb4e60ebdecb55b5974c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/standard.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 6ce3144dd0..5d7e903670 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -225,6 +225,9 @@ def extract(args, config, basepath, workspace):
225 import bb 225 import bb
226 226
227 tinfoil = _prep_extract_operation(config, basepath, args.recipename) 227 tinfoil = _prep_extract_operation(config, basepath, args.recipename)
228 if not tinfoil:
229 # Error already shown
230 return 1
228 231
229 rd = parse_recipe(config, tinfoil, args.recipename, True) 232 rd = parse_recipe(config, tinfoil, args.recipename, True)
230 if not rd: 233 if not rd:
@@ -271,6 +274,8 @@ def _prep_extract_operation(config, basepath, recipename):
271 trying to extract a package. Returns the tinfoil instance to be used.""" 274 trying to extract a package. Returns the tinfoil instance to be used."""
272 tinfoil = setup_tinfoil(basepath=basepath) 275 tinfoil = setup_tinfoil(basepath=basepath)
273 rd = parse_recipe(config, tinfoil, recipename, True) 276 rd = parse_recipe(config, tinfoil, recipename, True)
277 if not rd:
278 return None
274 279
275 if bb.data.inherits_class('kernel-yocto', rd): 280 if bb.data.inherits_class('kernel-yocto', rd):
276 tinfoil.shutdown() 281 tinfoil.shutdown()
@@ -500,6 +505,9 @@ def modify(args, config, basepath, workspace):
500 args.srctree) 505 args.srctree)
501 if args.extract: 506 if args.extract:
502 tinfoil = _prep_extract_operation(config, basepath, args.recipename) 507 tinfoil = _prep_extract_operation(config, basepath, args.recipename)
508 if not tinfoil:
509 # Error already shown
510 return 1
503 else: 511 else:
504 tinfoil = setup_tinfoil(basepath=basepath) 512 tinfoil = setup_tinfoil(basepath=basepath)
505 513