[OE-core] [PATCH][fido] wic: fix path parsing, use last occurrence

Ed Bartosh ed.bartosh at linux.intel.com
Mon Sep 14 08:19:14 UTC 2015


Hi George,

Thank you for the fix!

Acked-by: Ed Bartosh <ed.bartosh at linux.intel.com>

On Thu, Sep 10, 2015 at 12:30:52PM -0500, George McCollister wrote:
> 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
> -- 
> 2.4.5
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
--
Regards,
Ed



More information about the Openembedded-core mailing list