[OE-core] [PATCH 2/2] wic: check if BBLAYERS is valid before use
João Henrique Ferreira de Freitas
joaohf at gmail.com
Wed Jun 4 01:28:03 UTC 2014
If wic is running as raw mode, it's better to check if BBLAYERS
is valid before inspect it.
No functional changes.
Signed-off-by: João Henrique Ferreira de Freitas <joaohf at gmail.com>
---
scripts/lib/image/engine.py | 7 ++++---
scripts/lib/mic/plugin.py | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 3bda1bf..1256236 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -96,9 +96,10 @@ def build_canned_image_list(dl):
layers_path = get_bitbake_var("BBLAYERS")
canned_wks_layer_dirs = []
- for layer_path in layers_path.split():
- path = os.path.join(layer_path, SCRIPTS_CANNED_IMAGE_DIR)
- canned_wks_layer_dirs.append(path)
+ if layers_path is not None:
+ for layer_path in layers_path.split():
+ path = os.path.join(layer_path, SCRIPTS_CANNED_IMAGE_DIR)
+ canned_wks_layer_dirs.append(path)
path = os.path.join(dl, CANNED_IMAGE_DIR)
canned_wks_layer_dirs.append(path)
diff --git a/scripts/lib/mic/plugin.py b/scripts/lib/mic/plugin.py
index dec0e5b..585fd6d 100644
--- a/scripts/lib/mic/plugin.py
+++ b/scripts/lib/mic/plugin.py
@@ -53,9 +53,10 @@ class PluginMgr(object):
self.layers_path = get_bitbake_var("BBLAYERS")
layer_dirs = []
- for layer_path in self.layers_path.split():
- path = os.path.join(layer_path, SCRIPTS_PLUGIN_DIR, ptype)
- layer_dirs.append(path)
+ if self.layers_path is not None:
+ for layer_path in self.layers_path.split():
+ path = os.path.join(layer_path, SCRIPTS_PLUGIN_DIR, ptype)
+ layer_dirs.append(path)
path = os.path.join(dl, ptype)
layer_dirs.append(path)
--
1.9.1
More information about the Openembedded-core
mailing list