diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-15 13:49:38 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-15 14:02:08 +0000 |
commit | 3221d97323e655fe5db863157d71ca79983b5b07 (patch) | |
tree | 3bdeb04c2c71aa1c2cc27e6c743cb5688bc0b022 /bitbake | |
parent | 155f8a4c54bef65235c54945198f1fcddb642ea0 (diff) | |
download | poky-3221d97323e655fe5db863157d71ca79983b5b07.tar.gz |
bitbake: runqueue: Fix silly variable overlap
A previous commit of mine used the target variable for two different uses
resulting in a lot more sstate being installed than is needed.
Fix the variable to use two different names and unbreak the setscene
behaviour.
(Bitbake rev: f975ca2cf728561bd6317ed8f76303598546113a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 15064f8142..413d59f8f4 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -1888,12 +1888,12 @@ class RunQueueExecuteScenequeue(RunQueueExecute): | |||
1888 | if nexttask not in self.unskippable and len(self.sq_revdeps[nexttask]) > 0 and self.sq_revdeps[nexttask].issubset(self.scenequeue_covered) and self.check_dependencies(nexttask, self.sq_revdeps[nexttask], True): | 1888 | if nexttask not in self.unskippable and len(self.sq_revdeps[nexttask]) > 0 and self.sq_revdeps[nexttask].issubset(self.scenequeue_covered) and self.check_dependencies(nexttask, self.sq_revdeps[nexttask], True): |
1889 | realtask = self.rqdata.runq_setscene[nexttask] | 1889 | realtask = self.rqdata.runq_setscene[nexttask] |
1890 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[realtask]] | 1890 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[realtask]] |
1891 | target = False | 1891 | foundtarget = False |
1892 | for target in self.rqdata.target_pairs: | 1892 | for target in self.rqdata.target_pairs: |
1893 | if target[0] == fn and target[1] == self.rqdata.runq_task[realtask]: | 1893 | if target[0] == fn and target[1] == self.rqdata.runq_task[realtask]: |
1894 | target = True | 1894 | foundtarget = True |
1895 | break | 1895 | break |
1896 | if not target: | 1896 | if not foundtarget: |
1897 | logger.debug(2, "Skipping setscene for task %s" % self.rqdata.get_user_idstring(self.rqdata.runq_setscene[nexttask])) | 1897 | logger.debug(2, "Skipping setscene for task %s" % self.rqdata.get_user_idstring(self.rqdata.runq_setscene[nexttask])) |
1898 | self.task_skip(nexttask) | 1898 | self.task_skip(nexttask) |
1899 | self.scenequeue_notneeded.add(nexttask) | 1899 | self.scenequeue_notneeded.add(nexttask) |