summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-14 11:17:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-21 17:59:37 +0000
commite155952b4da47b025c04dcbf00d12daecbc5a44d (patch)
tree24102eec5c893d0ed9b86c7788f455a6e606ffd4 /meta/classes
parent1b7014ffc5a06a09484eebb91bf0d94e45abf98a (diff)
downloadpoky-e155952b4da47b025c04dcbf00d12daecbc5a44d.tar.gz
classes/buildhistory: fix splitting on + in package list fields
Ensure we do not erroneously split on + in RDEPENDS/RRECOMMENDS e.g. libstdc++-dev was being split into libstdc and -dev. (From OE-Core rev: cad533880df42ad4fe6f04d56d3a59cb4a033275) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/buildhistory.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index dfc9b73919..6c2d4e9653 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -124,7 +124,7 @@ python buildhistory_emit_pkghistory() {
124 return None 124 return None
125 125
126 def sortpkglist(string): 126 def sortpkglist(string):
127 pkgiter = re.finditer(r'[a-zA-Z0-9.-]+( \([><=]+ [^ )]+\))?', string, 0) 127 pkgiter = re.finditer(r'[a-zA-Z0-9.+-]+( \([><=]+ [^ )]+\))?', string, 0)
128 pkglist = [p.group(0) for p in pkgiter] 128 pkglist = [p.group(0) for p in pkgiter]
129 pkglist.sort() 129 pkglist.sort()
130 return ' '.join(pkglist) 130 return ' '.join(pkglist)