summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@buglabs.net>2009-07-29 17:51:26 +0200
committerMarcin Juszkiewicz <marcin@buglabs.net>2009-07-29 17:51:26 +0200
commit4b13072f1822c984434b7ee76d4946cf4548889e (patch)
treedeb344a362f3ea273827d38371a5b9f163bae0f9
parent1c332abfe220d6df6836f213a63159eb360d69b3 (diff)
downloadpoky-4b13072f1822c984434b7ee76d4946cf4548889e.tar.gz
cache.py: missed patch for Python 2.6
-rw-r--r--bitbake/lib/bb/cache.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 82efada67d..497e42705d 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -257,7 +257,7 @@ class Cache:
257 pv = self.getVar('PV', file_name, True) 257 pv = self.getVar('PV', file_name, True)
258 pr = self.getVar('PR', file_name, True) 258 pr = self.getVar('PR', file_name, True)
259 dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0") 259 dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0")
260 provides = Set([pn] + (self.getVar("PROVIDES", file_name, True) or "").split()) 260 provides = set([pn] + (self.getVar("PROVIDES", file_name, True) or "").split())
261 depends = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "") 261 depends = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "")
262 packages = (self.getVar('PACKAGES', file_name, True) or "").split() 262 packages = (self.getVar('PACKAGES', file_name, True) or "").split()
263 packages_dynamic = (self.getVar('PACKAGES_DYNAMIC', file_name, True) or "").split() 263 packages_dynamic = (self.getVar('PACKAGES_DYNAMIC', file_name, True) or "").split()
@@ -282,17 +282,17 @@ class Cache:
282 # Forward: virtual -> [filenames] 282 # Forward: virtual -> [filenames]
283 # Reverse: PN -> [virtuals] 283 # Reverse: PN -> [virtuals]
284 if pn not in cacheData.pn_provides: 284 if pn not in cacheData.pn_provides:
285 cacheData.pn_provides[pn] = Set() 285 cacheData.pn_provides[pn] = set()
286 cacheData.pn_provides[pn] |= provides 286 cacheData.pn_provides[pn] |= provides
287 287
288 cacheData.fn_provides[file_name] = Set() 288 cacheData.fn_provides[file_name] = set()
289 for provide in provides: 289 for provide in provides:
290 if provide not in cacheData.providers: 290 if provide not in cacheData.providers:
291 cacheData.providers[provide] = [] 291 cacheData.providers[provide] = []
292 cacheData.providers[provide].append(file_name) 292 cacheData.providers[provide].append(file_name)
293 cacheData.fn_provides[file_name].add(provide) 293 cacheData.fn_provides[file_name].add(provide)
294 294
295 cacheData.deps[file_name] = Set() 295 cacheData.deps[file_name] = set()
296 for dep in depends: 296 for dep in depends:
297 cacheData.all_depends.add(dep) 297 cacheData.all_depends.add(dep)
298 cacheData.deps[file_name].add(dep) 298 cacheData.deps[file_name].add(dep)
@@ -416,7 +416,7 @@ class CacheData:
416 self.pkg_dp = {} 416 self.pkg_dp = {}
417 self.pn_provides = {} 417 self.pn_provides = {}
418 self.fn_provides = {} 418 self.fn_provides = {}
419 self.all_depends = Set() 419 self.all_depends = set()
420 self.deps = {} 420 self.deps = {}
421 self.rundeps = {} 421 self.rundeps = {}
422 self.runrecs = {} 422 self.runrecs = {}