[oe-commits] [openembedded-core] 01/68: image_types_wic: fix expansion error

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 20f8fddd28fe46d7e694804de3d894cdf9f7c636
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Wed Feb 22 16:39:35 2017 +0200

    image_types_wic: fix expansion error
    
    Variable WKS_SEARCH_PATH was not fully expanded when used directly
    in this expression:
        WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}') or ''}"
    
    This caused expansion error: bb.data_smart.ExpansionError:
    Failure expanding variable WKS_FULL_PATH, .... which triggered exception
    SyntaxError: invalid syntax (WKS_FULL_PATH, line 1)
    
    Calling d.getVar instead of directly referencing variables
    should fix the issue.
    
    Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/image_types_wic.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index ec6c14d..d012a5d 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -8,7 +8,7 @@ WICVARS ?= "\
 WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks"
 WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
 WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/wic' % p for p in '${BBPATH}'.split(':'))}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l in '${BBPATH}:${COREBASE}'.split(':'))}"
-WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}') or ''}"
+WKS_FULL_PATH = "${@wks_search(d.getVar('WKS_FILES').split(), d.getVar('WKS_SEARCH_PATH')) or ''}"
 
 def wks_search(files, search_path):
     for f in files:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.