summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge McCollister <george.mccollister@gmail.com>2016-05-13 09:22:53 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-29 19:35:59 +0100
commitb17a009b6557cb698c5cc31daea37daf44ebb3aa (patch)
treede5d7088f49553f7f89fea71e74d4b5b88c69a16
parent426eb13fa9a4fcaf56c4fd03dd2db093ff657455 (diff)
downloadpoky-b17a009b6557cb698c5cc31daea37daf44ebb3aa.tar.gz
wic: fix path parsing, use last occurrence
If the path contains 'scripts' more than once the first occurrence will be incorrectly used. Use rfind instead of find to find the last occurrence. (From OE-Core rev: f30c486c17060d2f21618612804a692512ad6a57) (From OE-Core rev: d34a0fd910babe233d89ad9c1e9d61dcec1c4b63) Signed-off-by: George McCollister <george.mccollister@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/plugin.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py
index ccfdfcb934..151ff31671 100644
--- a/scripts/lib/wic/plugin.py
+++ b/scripts/lib/wic/plugin.py
@@ -42,7 +42,7 @@ class PluginMgr(object):
42 42
43 def __init__(self): 43 def __init__(self):
44 wic_path = os.path.dirname(__file__) 44 wic_path = os.path.dirname(__file__)
45 eos = wic_path.find('scripts') + len('scripts') 45 eos = wic_path.rfind('scripts') + len('scripts')
46 scripts_path = wic_path[:eos] 46 scripts_path = wic_path[:eos]
47 self.scripts_path = scripts_path 47 self.scripts_path = scripts_path
48 self.plugin_dir = scripts_path + PLUGIN_DIR 48 self.plugin_dir = scripts_path + PLUGIN_DIR