summaryrefslogtreecommitdiffstats
path: root/scripts/wic
diff options
context:
space:
mode:
authorMatt Madison <matt@madison.systems>2015-12-06 08:53:22 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:06 +0000
commit59b1eefb801dfb1d4afe9640e3c8a070d4e1867f (patch)
tree3ea519dd451fa35ade966f278152b4f2b2cdf93d /scripts/wic
parent473ccbebb426df757adb8955eaa5e191d88180d1 (diff)
downloadopenembedded-core-contrib-59b1eefb801dfb1d4afe9640e3c8a070d4e1867f.tar.gz
openembedded-core-contrib-59b1eefb801dfb1d4afe9640e3c8a070d4e1867f.tar.bz2
openembedded-core-contrib-59b1eefb801dfb1d4afe9640e3c8a070d4e1867f.zip
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>
Diffstat (limited to 'scripts/wic')
-rwxr-xr-xscripts/wic4
1 files 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: