From a3ee9cc7aebaecfa2223552a2c1865a9337de664 Mon Sep 17 00:00:00 2001 From: João Henrique Ferreira de Freitas Date: Tue, 3 Jun 2014 22:28:03 -0300 Subject: wic: check if BBLAYERS is valid before use MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Purdie --- 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 3bda1bf205..1256236304 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 dec0e5bf84..585fd6d563 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) -- cgit 1.2.3-korg