From: Matt Madison <matt@madison.systems>
Date: Sun, 6 Dec 2015 16:53:22 +0000 (-0800)
Subject: wic: insert local Python paths at front
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b3a3935c69b6e74e19cd0cb69d47350b9ea9c58e;p=openembedded-core.git

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.

Signed-off-by: Matt Madison <matt@madison.systems>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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: