From: Robert Yang <liezhi.yang@windriver.com>
Date: Wed, 30 Mar 2016 09:32:55 +0000 (-0700)
Subject: cookerdata.py: remove slash in the end
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b1cb21d18fb18399e682021b866babeced9a4aa;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index c5fdf6637e9..50259a9a073 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')