From: Paul Eggleton Date: Tue, 14 Feb 2012 11:17:51 +0000 (+0000) Subject: classes/buildhistory: fix splitting on + in package list fields X-Git-Tag: yocto-4.0~38122 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cad533880df42ad4fe6f04d56d3a59cb4a033275;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 --- diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index dfc9b73919a..6c2d4e9653d 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)