aboutsummaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-03-29 11:19:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-29 09:37:05 +0000
commit5d0839bef631dceb4395fcf204779a76966a1061 (patch)
tree864088e8a08c3b3fad426980544ee2c73d336d3f /meta/lib
parente6ffc747a8ca5142c9bc6fbd2b06b5808bb38b02 (diff)
downloadopenembedded-core-5d0839bef631dceb4395fcf204779a76966a1061.tar.gz
meta/lib/oe/lsb.py: fix data extraction from /etc/lsb-release
In some cases, /etc/lsb-release file is used to extract info about poky build host machine. But the strings are not stripped of end of line special characters. As such, when this info is concatenated and used as a directory entry in sstate_cache, this is an issue. Usually, this issue is masked by the fact that distro related info is extracted from the output of lsb_release command. In case of Yocto Linux, running "lsb_release -a" will give an error code because CODENAME info is not present. As such, bitbake will extract the info from /etc/lsb-release, running into the above issue. Consequence is that building under BA will crash. Partial fix for [YOCTO #4071] Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/lsb.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/lsb.py b/meta/lib/oe/lsb.py
index f4a5ba1c17..ebf90baace 100644
--- a/meta/lib/oe/lsb.py
+++ b/meta/lib/oe/lsb.py
@@ -26,7 +26,7 @@ def release_dict_file():
with open('/etc/lsb-release') as f:
for line in f:
key, value = line.split("=", 1)
- data[key] = value
+ data[key] = value.strip()
elif os.path.exists('/etc/redhat-release'):
data = {}
with open('/etc/redhat-release') as f: