]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic: fix path parsing, use last occurrence
authorGeorge McCollister <george.mccollister@gmail.com>
Fri, 13 May 2016 14:22:53 +0000 (09:22 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 27 Jul 2016 08:00:23 +0000 (09:00 +0100)
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.

Signed-off-by: George McCollister <george.mccollister@gmail.com>
scripts/lib/wic/plugin.py

index ccfdfcb934bc5610385ac72388c2161f63e59798..151ff3167158ae5b014d0da1ab44199eca55716f 100644 (file)
@@ -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