]> 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>
Fri, 20 May 2016 09:20:22 +0000 (10:20 +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>
Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/lib/wic/plugin.py

index dcbaa0855612fb542ff7b22104741ecf954409cf..306b32437ea14df7bd01a1c532f19a69ca8d8ea0 100644 (file)
@@ -42,7 +42,7 @@ class PluginMgr():
 
     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