From 687327d494e01e699bf32510a60950278d6b4754 Mon Sep 17 00:00:00 2001 From: George McCollister Date: Thu, 10 Sep 2015 12:30:52 -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: 35ecb0b8557aae85f377c9d99f1a72cbb76fb6d8) Signed-off-by: George McCollister Signed-off-by: Richard Purdie --- scripts/lib/wic/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py index 41a80175ca..3acd5b480e 100644 --- a/scripts/lib/wic/plugin.py +++ b/scripts/lib/wic/plugin.py @@ -42,7 +42,7 @@ class PluginMgr(object): 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