[oe-commits] Paul Eggleton : classes/buildhistory: fix splitting on + in package list fields

git at git.openembedded.org git at git.openembedded.org
Tue Feb 21 18:01:45 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: cad533880df42ad4fe6f04d56d3a59cb4a033275
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=cad533880df42ad4fe6f04d56d3a59cb4a033275

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Tue Feb 14 11:17:51 2012 +0000

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 at linux.intel.com>

---

 meta/classes/buildhistory.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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)





More information about the Openembedded-commits mailing list