From 9c7c18d06fcee628a847ad696be596383e168378 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 16 Nov 2010 13:01:51 -0700 Subject: Pre-explode rundeps/runrecs in CacheData (Bitbake rev: 0c8e0f3191252ccedb83c431c48e5c7d905e2717) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/cache.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'bitbake/lib/bb/cache.py') diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 51eb3b82f7..9756ada960 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -440,16 +440,18 @@ class Cache: if not file_name in cacheData.runrecs: cacheData.runrecs[file_name] = {} - rdepends = self.getVar('RDEPENDS', file_name, True) or "" - rrecommends = self.getVar('RRECOMMENDS', file_name, True) or "" + rdepends = bb.utils.explode_deps(self.getVar('RDEPENDS', file_name, True) or "") + rrecommends = bb.utils.explode_deps(self.getVar('RRECOMMENDS', file_name, True) or "") for package in packages + [pn]: if not package in cacheData.rundeps[file_name]: cacheData.rundeps[file_name][package] = [] if not package in cacheData.runrecs[file_name]: cacheData.runrecs[file_name][package] = [] - cacheData.rundeps[file_name][package] = rdepends + " " + (self.getVar("RDEPENDS_%s" % package, file_name, True) or "") - cacheData.runrecs[file_name][package] = rrecommends + " " + (self.getVar("RRECOMMENDS_%s" % package, file_name, True) or "") + rdeps_pkg = bb.utils.explode_deps(self.getVar('RDEPENDS_%s' % package, file_name, True) or "") + cacheData.rundeps[file_name][package] = rdepends + rdeps_pkg + rrecs_pkg = bb.utils.explode_deps(self.getVar('RDEPENDS_%s' % package, file_name, True) or "") + cacheData.runrecs[file_name][package] = rrecommends + rrecs_pkg # Collect files we may need for possible world-dep # calculations -- cgit v1.2.3-54-g00ecf