Patchwork [5/7] classes/buildhistory: fix splitting on + in package list fields

login
register
mail settings
Submitter Paul Eggleton
Date Feb. 14, 2012, 1:40 p.m.
Message ID <d1e49362229ba4267dd975335332c9226a015bfa.1329226672.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/21253/
State Accepted
Commit cad533880df42ad4fe6f04d56d3a59cb4a033275
Headers show

Comments

Paul Eggleton - Feb. 14, 2012, 1:40 p.m.
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>
---
 meta/classes/buildhistory.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index dfc9b73..6c2d4e9 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)