summaryrefslogtreecommitdiff
path: root/scripts/lib/devtool
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:48:34 +0100
commita46fb1a06be2df00a0bceb4e60ebdecb55b5974c (patch)
tree09f4304d3192698f8ba6415d8694f669921b2978 /scripts/lib/devtool
parentbd8ff33cf2439536c6e41cf0ee9dd8fb3b64770a (diff)
downloadopenembedded-core-a46fb1a06be2df00a0bceb4e60ebdecb55b5974c.tar.gz
openembedded-core-a46fb1a06be2df00a0bceb4e60ebdecb55b5974c.tar.bz2
openembedded-core-a46fb1a06be2df00a0bceb4e60ebdecb55b5974c.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/lib/devtool')
-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):
import bb
tinfoil = _prep_extract_operation(config, basepath, args.recipename)
+ if not tinfoil:
+ # Error already shown
+ return 1
rd = parse_recipe(config, tinfoil, args.recipename, True)
if not rd:
@@ -271,6 +274,8 @@ def _prep_extract_operation(config, basepath, recipename):
trying to extract a package. Returns the tinfoil instance to be used."""
tinfoil = setup_tinfoil(basepath=basepath)
rd = parse_recipe(config, tinfoil, recipename, True)
+ if not rd:
+ return None
if bb.data.inherits_class('kernel-yocto', rd):
tinfoil.shutdown()
@@ -500,6 +505,9 @@ def modify(args, config, basepath, workspace):
args.srctree)
if args.extract:
tinfoil = _prep_extract_operation(config, basepath, args.recipename)
+ if not tinfoil:
+ # Error already shown
+ return 1
else:
tinfoil = setup_tinfoil(basepath=basepath)
'>recipes/abiword/abiword-embedded_2.6.4.bb8
-rw-r--r--recipes/abiword/abiword-embedded_2.6.8.bb8
-rw-r--r--recipes/abiword/abiword-plugins_2.4.6.bb27
-rw-r--r--recipes/abiword/abiword-plugins_2.5.1.bb40
-rw-r--r--recipes/abiword/abiword-plugins_2.5.2.bb41
-rw-r--r--recipes/abiword/abiword-plugins_2.6.0.bb44
-rw-r--r--recipes/abiword/abiword-plugins_2.6.4.bb62
-rw-r--r--recipes/abiword/abiword-plugins_2.6.8.bb61
-rw-r--r--recipes/abiword/abiword.inc49
-rw-r--r--recipes/abiword/abiword_2.4.6.bb4
-rw-r--r--recipes/abiword/abiword_2.5.1.bb7
-rw-r--r--recipes/abiword/abiword_2.5.2.bb7
-rw-r--r--recipes/abiword/abiword_2.6.0.bb3
-rw-r--r--recipes/abiword/abiword_2.6.3.bb10
-rw-r--r--recipes/abiword/abiword_2.6.4.bb10
-rw-r--r--recipes/abiword/abiword_2.6.8.bb8
-rw-r--r--recipes/abiword/files/abiword-cxx-for-ld-fix.patch12
-rw-r--r--recipes/abiword/files/abiword-plugin-pdf-poppler.patch11
-rwxr-xr-xrecipes/abiword/files/cdump.pl32
-rw-r--r--recipes/abuse/abuse_0.7.0.bb11
-rw-r--r--recipes/accelges/accelges_svn.bb46
-rw-r--r--recipes/acct/acct_6.3.99+6.4pre1.bb9
-rw-r--r--recipes/acct/files/cross-compile.patch34
-rw-r--r--recipes/acpid/acpid.inc24
-rw-r--r--recipes/acpid/acpid/gcc40.patch16
-rw-r--r--recipes/acpid/acpid_1.0.2.bb3
-rw-r--r--recipes/acpid/acpid_1.0.3.bb4
-rw-r--r--recipes/acpid/acpid_1.0.4.bb4
-rw-r--r--recipes/acpid/acpid_1.0.6.bb3
-rwxr-xr-xrecipes/acpid/files/init26
-rw-r--r--recipes/addons/devshell.bb75
-rw-r--r--recipes/adns/adns-1.0/configure.patch137
-rw-r--r--recipes/adns/adns-1.0/fixparsedomainflags.patch11
-rw-r--r--recipes/adns/adns_1.0.bb30
-rw-r--r--recipes/adobe-flash/flash-plugin_10.0.22.87.bb35
-rw-r--r--recipes/agg/agg-minimal_2.5.bb43
-rw-r--r--recipes/agg/agg_2.5.bb47
-rw-r--r--recipes/aiostress/aiostress_0.0.bb18
-rw-r--r--recipes/aircrack/aircrack-ng_0.9.3.bb22
-rw-r--r--recipes/aircrack/aircrack-ng_1.0-svn.bb40
-rw-r--r--recipes/aircrack/aircrack_2.1.bb22
-rw-r--r--recipes/aircrack/aircrack_2.41.bb24
-rw-r--r--recipes/aircrack/files/makefile-ldflags.patch13
-rw-r--r--recipes/aircrack/files/oe.patch10
-rw-r--r--recipes/aircrack/files/silent_patch.diff87
-rw-r--r--recipes/albumshaper/albumshaper_2.1.bb18
-rw-r--r--recipes/albumshaper/files/fixpaths.patch53
-rw-r--r--recipes/aliens/aliens_1.0.0.bb21
-rw-r--r--recipes/alp/hiker_0.9.1.bb24
-rw-r--r--recipes/alp/hiker_0.9.bb24
-rw-r--r--recipes/alsa/alsa-driver/adriver.h.patch23
-rw-r--r--recipes/alsa/alsa-driver/h5400.patch12
-rw-r--r--recipes/alsa/alsa-driver/sa11xx.patch38
-rw-r--r--recipes/alsa/alsa-driver/sound.p.patch59
-rw-r--r--recipes/alsa/alsa-driver_0.9.6-hh4c.bb83
-rw-r--r--recipes/alsa/alsa-fpu.inc6
-rw-r--r--recipes/alsa/alsa-lib/fix-tstamp-declaration.patch13
-rw-r--r--recipes/alsa/alsa-lib/fix_libmath.patch17
-rw-r--r--recipes/alsa/alsa-lib/unbreak_plugindir.patch12
-rw-r--r--recipes/alsa/alsa-lib_1.0.11.bb41
-rw-r--r--recipes/alsa/alsa-lib_1.0.13.bb42
-rw-r--r--recipes/alsa/alsa-lib_1.0.14.bb47
-rw-r--r--recipes/alsa/alsa-lib_1.0.15.bb54
-rw-r--r--recipes/alsa/alsa-lib_1.0.17.bb48
-rw-r--r--recipes/alsa/alsa-lib_1.0.18.bb48
-rw-r--r--recipes/alsa/alsa-oss_1.0.11.bb19
-rw-r--r--recipes/alsa/alsa-oss_1.0.14.bb17
-rw-r--r--recipes/alsa/alsa-oss_1.0.15.bb22
-rw-r--r--recipes/alsa/alsa-oss_1.0.17.bb20
-rw-r--r--recipes/alsa/alsa-plugins_1.0.15.bb20
-rw-r--r--recipes/alsa/alsa-plugins_1.0.17.bb20
-rw-r--r--recipes/alsa/alsa-plugins_1.0.18.bb20
-rw-r--r--recipes/alsa/alsa-scenario_git.bb13
-rw-r--r--recipes/alsa/alsa-state.bb58
-rw-r--r--recipes/alsa/alsa-state/a780/gsmhandset.state55
-rw-r--r--recipes/alsa/alsa-state/a780/gsmheadset.state55
-rw-r--r--recipes/alsa/alsa-state/a780/stereoout.state55
-rw-r--r--recipes/alsa/alsa-state/akita/asound.state619
-rwxr-xr-xrecipes/alsa/alsa-state/alsa-state29
-rw-r--r--recipes/alsa/alsa-state/asound.conf12
-rw-r--r--recipes/alsa/alsa-state/asound.state1
-rw-r--r--recipes/alsa/alsa-state/at91sam9263ek/asound.conf2
-rw-r--r--recipes/alsa/alsa-state/at91sam9263ek/asound.state283
-rw-r--r--recipes/alsa/alsa-state/c7x0/asound.state150
-rw-r--r--recipes/alsa/alsa-state/hx4700/asound.state37
-rw-r--r--recipes/alsa/alsa-state/magician/asound.state202
-rw-r--r--recipes/alsa/alsa-state/nokia800/asound.state105
-rw-r--r--recipes/alsa/alsa-state/spitz/asound.state619
-rw-r--r--recipes/alsa/alsa-state/tosa/asound.state769
-rw-r--r--recipes/alsa/alsa-utils_1.0.11.bb55
-rw-r--r--recipes/alsa/alsa-utils_1.0.13.bb63
-rw-r--r--recipes/alsa/alsa-utils_1.0.14.bb56
-rw-r--r--recipes/alsa/alsa-utils_1.0.15.bb57
-rw-r--r--recipes/alsa/alsa-utils_1.0.17.bb63
-rw-r--r--recipes/alsa/alsa-utils_1.0.18.bb66
-rw-r--r--recipes/alsa/alsa-versym.inc6
-rw-r--r--recipes/alsa/files/alsa-utils-autoconf-strl-funcs.patch43
-rw-r--r--recipes/alsa/files/alsa-utils-automake.patch10
-rw-r--r--recipes/alsa/files/alsa-utils-remove-xmlto.patch15
-rw-r--r--recipes/alsa/files/alsa-utils-sys-siglist.patch15
-rw-r--r--recipes/alsa/files/libio.patch43
-rw-r--r--recipes/altboot/README.txt4
-rw-r--r--recipes/altboot/altboot.inc19
-rw-r--r--recipes/altboot/altboot_1.0.8+1.0.9_pre1.bb76
-rw-r--r--recipes/altboot/altboot_1.0.8.bb49
-rw-r--r--recipes/altboot/altboot_1.1.1+wip-SVNR83.bb76
-rw-r--r--recipes/altboot/altboot_svn.bb75
-rw-r--r--recipes/altboot/files/sd-dynamic-fix.patch44
-rw-r--r--recipes/amule/amule_2.1.3.bb27
-rw-r--r--recipes/amule/files/parser.patch20
-rw-r--r--recipes/angstrom/angstrom-bootmanager.bb11
-rw-r--r--recipes/angstrom/angstrom-feed-configs.bb73
-rw-r--r--recipes/angstrom/angstrom-gnome-icon-theme-enable.bb16
-rw-r--r--recipes/angstrom/angstrom-gpe-task-apps.bb23
-rw-r--r--recipes/angstrom/angstrom-gpe-task-base.bb42
-rw-r--r--recipes/angstrom/angstrom-gpe-task-game.bb13
-rw-r--r--recipes/angstrom/angstrom-gpe-task-pim.bb13
-rw-r--r--recipes/angstrom/angstrom-gpe-task-settings.bb18
-rw-r--r--recipes/angstrom/angstrom-led-config.bb31
-rw-r--r--recipes/angstrom/angstrom-led-config/at32stk1000/leds9
-rw-r--r--recipes/angstrom/angstrom-led-config/beagleboard/leds3
-rwxr-xr-xrecipes/angstrom/angstrom-led-config/led-config31