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-07-27 09:00:53 +0100
commit9149baa38d5e5bcf5d5c174d03df9056d5a7815a (patch)
tree6533ad3d546324f189a9b0d85e448ab8e441fa37
parenta01d3234f6955097b221e030f3b403d8fa797c7f (diff)
downloadpoky-9149baa38d5e5bcf5d5c174d03df9056d5a7815a.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: fd544c3ef6ece1e2f9849ee87227efc6d0954e15) Signed-off-by: George McCollister <george.mccollister@gmail.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