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

git at git.openembedded.org git at git.openembedded.org
Wed Jul 27 08:01:31 UTC 2016


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

commit fd544c3ef6ece1e2f9849ee87227efc6d0954e15
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.
    
    Signed-off-by: George McCollister <george.mccollister at gmail.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.


More information about the Openembedded-commits mailing list