summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-10 15:09:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-12 08:26:14 +0100
commitc035bf9c2166bc1730e978a47ab9da0b60c98676 (patch)
treeec094066620200ecaddcab9fd59ae4a8017a9a25 /bitbake/lib
parentd8cf6e956fb1cb948630b8d8970b0c26febb35c6 (diff)
downloadpoky-c035bf9c2166bc1730e978a47ab9da0b60c98676.tar.gz
bitbake: cooker.py: Drop confusing updateCache calls
updateCache() gets called by command.py when needed and needs to be iterated over. The calls in cooker.py are therefore just plain wrong/confusing now. (Bitbake rev: 8b7c65bba466bb6773c56849074978ce2c956129) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/cooker.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index cd3b6e3e9a..b717de51e4 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -359,9 +359,6 @@ class BBCooker:
359 359
360 def showVersions(self): 360 def showVersions(self):
361 361
362 # Need files parsed
363 self.updateCache()
364
365 pkg_pn = self.status.pkg_pn 362 pkg_pn = self.status.pkg_pn
366 (latest_versions, preferred_versions) = bb.providers.findProviders(self.configuration.data, self.status, pkg_pn) 363 (latest_versions, preferred_versions) = bb.providers.findProviders(self.configuration.data, self.status, pkg_pn)
367 364
@@ -396,8 +393,6 @@ class BBCooker:
396 fn = self.matchFile(fn) 393 fn = self.matchFile(fn)
397 fn = bb.cache.Cache.realfn2virtual(fn, cls) 394 fn = bb.cache.Cache.realfn2virtual(fn, cls)
398 elif len(pkgs_to_build) == 1: 395 elif len(pkgs_to_build) == 1:
399 self.updateCache()
400
401 ignore = self.configuration.data.getVar("ASSUME_PROVIDED", True) or "" 396 ignore = self.configuration.data.getVar("ASSUME_PROVIDED", True) or ""
402 if pkgs_to_build[0] in set(ignore.split()): 397 if pkgs_to_build[0] in set(ignore.split()):
403 bb.fatal("%s is in ASSUME_PROVIDED" % pkgs_to_build[0]) 398 bb.fatal("%s is in ASSUME_PROVIDED" % pkgs_to_build[0])
@@ -445,8 +440,7 @@ class BBCooker:
445 Prepare a runqueue and taskdata object for iteration over pkgs_to_build 440 Prepare a runqueue and taskdata object for iteration over pkgs_to_build
446 """ 441 """
447 bb.event.fire(bb.event.TreeDataPreparationStarted(), self.configuration.data) 442 bb.event.fire(bb.event.TreeDataPreparationStarted(), self.configuration.data)
448 # Need files parsed 443
449 self.updateCache()
450 # If we are told to do the None task then query the default task 444 # If we are told to do the None task then query the default task
451 if (task == None): 445 if (task == None):
452 task = self.configuration.cmd 446 task = self.configuration.cmd
@@ -1208,9 +1202,6 @@ class BBCooker:
1208 Attempt to build the targets specified 1202 Attempt to build the targets specified
1209 """ 1203 """
1210 1204
1211 # Need files parsed
1212 self.updateCache()
1213
1214 # If we are told to do the NULL task then query the default task 1205 # If we are told to do the NULL task then query the default task
1215 if (task == None): 1206 if (task == None):
1216 task = self.configuration.cmd 1207 task = self.configuration.cmd