[oe-commits] [openembedded-core] 03/12: scripts/wic: fix error of import wic module in eSDK environment

[git at git.openembedded.org]

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

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

commit dcea30b885797ece3439cf1201795a975628d664
Author: Chang Rebecca Swee Fun <rebecca.swee.fun.chang at intel.com>
AuthorDate: Thu Jan 11 22:55:21 2018 +0800

    scripts/wic: fix error of import wic module in eSDK environment
    
    wic modules in scripts/lib/ are needed for wic to work, but path to
    the python module is not exported in eSDK environment and we were
    using an absolutized path of wic script within the sysroots.
    
    We now changed to use real script path instead, where the wic modules
    are located. This will also resolved the tracebacks found when running
    wic from within the eSDK environment.
    
    Traceback (most recent call last):
      File "/tmp/deploy/sdk/poky_sdk/sysroots/x86_64-pokysdk-linux/usr/bin/wic", line 58, in <module>
        from wic import WicError
    ImportError: No module named 'wic'
    
    Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/wic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/wic b/scripts/wic
index 293a216..d9bea22 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -40,7 +40,7 @@ from collections import namedtuple
 from distutils import spawn
 
 # External modules
-scripts_path = os.path.abspath(os.path.dirname(__file__))
+scripts_path = os.path.dirname(os.path.realpath(__file__))
 lib_path = scripts_path + '/lib'
 sys.path.insert(0, lib_path)
 import scriptpath

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