diff options
| author |   George McCollister <george.mccollister@gmail.com> | 2016-05-13 09:22:53 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:34:42 +0100 |
| commit | d34a0fd910babe233d89ad9c1e9d61dcec1c4b63 (patch) | |
| tree | 192cdef7ba8261bd660749763c4d9b5f7c664335 /scripts | |
| parent | 97c447ba39a6c81f13f02b7abd43138c538285e6 (diff) | |
| download | openembedded-core-d34a0fd910babe233d89ad9c1e9d61dcec1c4b63.tar.gz | |
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@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/wic/plugin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py index ccfdfcb934..151ff31671 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 |