From 70b0e62af991089b6c0b2218512240940ca80f3e Mon Sep 17 00:00:00 2001 From: George McCollister Date: Fri, 13 May 2016 09:22:53 -0500 Subject: 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) Signed-off-by: George McCollister Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/lib/wic/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py index dcbaa08556..306b32437e 100644 --- a/scripts/lib/wic/plugin.py +++ b/scripts/lib/wic/plugin.py @@ -42,7 +42,7 @@ class PluginMgr(): def __init__(self): wic_path = os.path.dirname(__file__) - eos = wic_path.find('scripts') + len('scripts') + eos = wic_path.rfind('scripts') + len('scripts') scripts_path = wic_path[:eos] self.scripts_path = scripts_path self.plugin_dir = scripts_path + PLUGIN_DIR -- cgit v1.2.3-54-g00ecf