From 32728d09462d66cb0e9d5e366154b63058cb8709 Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Sun, 6 Dec 2015 08:53:22 -0800 Subject: wic: insert local Python paths at front This follows how bitbake performs path insertion, and fixes a failure to start wic on Ubuntu 15.10 with the distribution's version of python-ply installed. (From OE-Core rev: b3a3935c69b6e74e19cd0cb69d47350b9ea9c58e) Signed-off-by: Matt Madison Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/wic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/wic b/scripts/wic index 7ad2b191c6..2286f20a96 100755 --- a/scripts/wic +++ b/scripts/wic @@ -41,12 +41,12 @@ from distutils import spawn # External modules scripts_path = os.path.abspath(os.path.dirname(__file__)) lib_path = scripts_path + '/lib' -sys.path.append(lib_path) +sys.path.insert(0, lib_path) bitbake_exe = spawn.find_executable('bitbake') if bitbake_exe: bitbake_path = os.path.join(os.path.dirname(bitbake_exe), '../lib') - sys.path.append(bitbake_path) + sys.path.insert(0, bitbake_path) from bb import cookerdata from bb.main import bitbake_main, BitBakeConfigParameters else: -- cgit v1.2.3-54-g00ecf