diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2010-11-16 13:01:51 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-11-18 11:02:38 -0700 |
| commit | 0c8e0f3191252ccedb83c431c48e5c7d905e2717 (patch) | |
| tree | 6e789cfd5f06e95a060dfbcc65e68f6ad534f6c6 /lib/bb/cache.py | |
| parent | b3d5432cff0ff28f4c8a5bcf10efa3e383b4fd4d (diff) | |
| download | openembedded-core-contrib-0c8e0f3191252ccedb83c431c48e5c7d905e2717.tar.gz | |
Pre-explode rundeps/runrecs in CacheData
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'lib/bb/cache.py')
| -rw-r--r-- | lib/bb/cache.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py index 63f218deea..b1ea59f455 100644 --- a/lib/bb/cache.py +++ b/lib/bb/cache.py @@ -436,16 +436,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 |