summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGeorge McCollister <george.mccollister@gmail.com>2015-09-10 12:30:52 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-18 19:22:25 +0100
commit687327d494e01e699bf32510a60950278d6b4754 (patch)
treed40ad51a6c1c793fd5321a0e650b4b79dbaa6490 /scripts
parentc18dff0871ae65b9743d48cc3735f24816ed74af (diff)
downloadast2050-yocto-poky-687327d494e01e699bf32510a60950278d6b4754.zip
ast2050-yocto-poky-687327d494e01e699bf32510a60950278d6b4754.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: 35ecb0b8557aae85f377c9d99f1a72cbb76fb6d8) Signed-off-by: George McCollister <george.mccollister@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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 41a8017..3acd5b4 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
OpenPOWER on IntegriCloud