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-05-20 10:20:55 +0100
commit70b0e62af991089b6c0b2218512240940ca80f3e (patch)
tree1c5a3a7be0408cc224422288b7bbac2e9fdda81d
parent55159ef0567c9c5f47609a18cff8866a17e53173 (diff)
downloadpoky-70b0e62af991089b6c0b2218512240940ca80f3e.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) 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>
-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 dcbaa08556..306b32437e 100644
--- a/scripts/lib/wic/plugin.py
+++ b/scripts/lib/wic/plugin.py
@@ -42,7 +42,7 @@ class PluginMgr():
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