[oe-commits] [openembedded-core] 62/94: wic: fix path parsing, use last occurrence

[git at git.openembedded.org]

rpurdie pushed a commit to branch krogoth
in repository openembedded-core.

commit d34a0fd910babe233d89ad9c1e9d61dcec1c4b63
Author: George McCollister <george.mccollister at gmail.com>
AuthorDate: Fri May 13 09:22:53 2016 -0500

    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 at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster at mvista.com>
---
 scripts/lib/wic/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py
index ccfdfcb..151ff31 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.