[oe-commits] George McCollister : wic: fix path parsing, use last occurrence
git at git.openembedded.org
git at git.openembedded.org
Sat Sep 19 08:53:12 UTC 2015
Module: openembedded-core.git
Branch: fido
Commit: 35ecb0b8557aae85f377c9d99f1a72cbb76fb6d8
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=35ecb0b8557aae85f377c9d99f1a72cbb76fb6d8
Author: George McCollister <george.mccollister at gmail.com>
Date: Thu Sep 10 12:30:52 2015 -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 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
More information about the Openembedded-commits
mailing list