[oe-commits] [bitbake] branch master-next updated: cookerdata.py: remove slash in the end

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

The following commit(s) were added to refs/heads/master-next by this push:
       new  2b1cb21   cookerdata.py: remove slash in the end
2b1cb21 is described below

commit 2b1cb21d18fb18399e682021b866babeced9a4aa
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Wed Mar 30 02:32:55 2016 -0700

    cookerdata.py: remove slash in the end
    
    It's very possible that we added layer as:
    BBLAYERS += "/path/to/meta/"
    
    then there would be warning:
    WARNING: No bb files matched BBFILE_PATTERN_core '^/path/to/meta//'
    
    This patch can fix the problem.
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cookerdata.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index c5fdf66..50259a9 100644
--- a/lib/bb/cookerdata.py
+++ b/lib/bb/cookerdata.py
@@ -292,6 +292,8 @@ class CookerDataBuilder(object):
                 parselog.debug(2, "Adding layer %s", layer)
                 if 'HOME' in approved and '~' in layer:
                     layer = os.path.expanduser(layer)
+                if layer.endswith('/'):
+                    layer = layer.rstrip('/')
                 data.setVar('LAYERDIR', layer)
                 data = parse_config_file(os.path.join(layer, "conf", "layer.conf"), data)
                 data.expandVarref('LAYERDIR')

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