summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/runqueue.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-10 14:35:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-12 08:26:14 +0100
commit51e54ed8a9c2cd5b2cb319ebb7cf257e85cbdc55 (patch)
tree1f2e4b80350d2b6cd03b319b13dc743585073182 /bitbake/lib/bb/runqueue.py
parent6ebdeb48c40aa6b45b733e885dfec8ceb6a32221 (diff)
downloadpoky-51e54ed8a9c2cd5b2cb319ebb7cf257e85cbdc55.tar.gz
bitbake: cooker: Separate out collections handling code into its own class
The Cooker class is too large and needs to be split up into different functional units. Splitting out the collections code into its own class seems like a good place to start to try and disentangle things. (Bitbake rev: ca1fcbb6e214c155a05328779d3d326e10c5eac0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r--bitbake/lib/bb/runqueue.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 872bb784d3..e960b4f9da 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -957,7 +957,7 @@ class RunQueue:
957 for task in range(len(self.rqdata.runq_fnid)): 957 for task in range(len(self.rqdata.runq_fnid)):
958 if self.rqdata.runq_fnid[task] not in done: 958 if self.rqdata.runq_fnid[task] not in done:
959 fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]] 959 fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]]
960 the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.get_file_appends(fn), self.cooker.configuration.data) 960 the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.collection.get_file_appends(fn), self.cooker.configuration.data)
961 done.add(self.rqdata.runq_fnid[task]) 961 done.add(self.rqdata.runq_fnid[task])
962 962
963 bb.parse.siggen.dump_sigs(self.rqdata.dataCache) 963 bb.parse.siggen.dump_sigs(self.rqdata.dataCache)
@@ -1123,7 +1123,7 @@ class RunQueueExecute:
1123 bb.parse.siggen.set_taskdata(self.rqdata.hashes, self.rqdata.hash_deps) 1123 bb.parse.siggen.set_taskdata(self.rqdata.hashes, self.rqdata.hash_deps)
1124 ret = 0 1124 ret = 0
1125 try: 1125 try:
1126 the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.get_file_appends(fn), self.cooker.configuration.data) 1126 the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.collection.get_file_appends(fn), self.cooker.configuration.data)
1127 the_data.setVar('BB_TASKHASH', self.rqdata.runq_hash[task]) 1127 the_data.setVar('BB_TASKHASH', self.rqdata.runq_hash[task])
1128 for h in self.rqdata.hashes: 1128 for h in self.rqdata.hashes:
1129 the_data.setVar("BBHASH_%s" % h, self.rqdata.hashes[h]) 1129 the_data.setVar("BBHASH_%s" % h, self.rqdata.hashes[h])