MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cache.py: missed patch for Python 2.6

Browse Source
This commit is contained in:
Marcin Juszkiewicz 2009-07-29 17:51:26 +02:00
parent 1c332abfe2
commit 4b13072f18
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bitbake/lib/bb/cache.py
View File

@ -257,7 +257,7 @@ class Cache:
pv = self.getVar('PV', file_name, True) pv = self.getVar('PV', file_name, True)
pr = self.getVar('PR', file_name, True) pr = self.getVar('PR', file_name, True)
dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0") dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0")
provides = Set([pn] + (self.getVar("PROVIDES", file_name, True) or "").split()) provides = set([pn] + (self.getVar("PROVIDES", file_name, True) or "").split())
depends = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "") depends = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "")
packages = (self.getVar('PACKAGES', file_name, True) or "").split() packages = (self.getVar('PACKAGES', file_name, True) or "").split()
packages_dynamic = (self.getVar('PACKAGES_DYNAMIC', file_name, True) or "").split() packages_dynamic = (self.getVar('PACKAGES_DYNAMIC', file_name, True) or "").split()
@ -282,17 +282,17 @@ class Cache:
# Forward: virtual -> [filenames] # Forward: virtual -> [filenames]
# Reverse: PN -> [virtuals] # Reverse: PN -> [virtuals]
if pn not in cacheData.pn_provides: if pn not in cacheData.pn_provides:
cacheData.pn_provides[pn] = Set() cacheData.pn_provides[pn] = set()
cacheData.pn_provides[pn] |= provides cacheData.pn_provides[pn] |= provides
cacheData.fn_provides[file_name] = Set() cacheData.fn_provides[file_name] = set()
for provide in provides: for provide in provides:
if provide not in cacheData.providers: if provide not in cacheData.providers:
cacheData.providers[provide] = [] cacheData.providers[provide] = []
cacheData.providers[provide].append(file_name) cacheData.providers[provide].append(file_name)
cacheData.fn_provides[file_name].add(provide) cacheData.fn_provides[file_name].add(provide)
cacheData.deps[file_name] = Set() cacheData.deps[file_name] = set()
for dep in depends: for dep in depends:
cacheData.all_depends.add(dep) cacheData.all_depends.add(dep)
cacheData.deps[file_name].add(dep) cacheData.deps[file_name].add(dep)
@ -416,7 +416,7 @@ class CacheData:
self.pkg_dp = {} self.pkg_dp = {}
self.pn_provides = {} self.pn_provides = {}
self.fn_provides = {} self.fn_provides = {}
self.all_depends = Set() self.all_depends = set()
self.deps = {} self.deps = {}
self.rundeps = {} self.rundeps = {}
self.runrecs = {} self.runrecs = {}