summaryrefslogtreecommitdiff
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:48:54 +0000
commitcad533880df42ad4fe6f04d56d3a59cb4a033275 (patch)
treebbbfe4abb76cfc732b3dcb9f7801a755bc087765
parentcb939b753c9e7648a38e22e0349c279da785e69d (diff)
downloadopenembedded-core-cad533880df42ad4fe6f04d56d3a59cb4a033275.tar.gz
openembedded-core-cad533880df42ad4fe6f04d56d3a59cb4a033275.tar.bz2
openembedded-core-cad533880df42ad4fe6f04d56d3a59cb4a033275.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-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() {
return None
def sortpkglist(string):
- pkgiter = re.finditer(r'[a-zA-Z0-9.-]+( \([><=]+ [^ )]+\))?', string, 0)
+ pkgiter = re.finditer(r'[a-zA-Z0-9.+-]+( \([><=]+ [^ )]+\))?', string, 0)
pkglist = [p.group(0) for p in pkgiter]
pkglist.sort()
return ' '.join(pkglist)