summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-02-08 18:50:34 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-15 17:03:47 +0000
commitde7c939a7f15f1800a56261303672fa0e5c740c7 (patch)
treec36ae64e82164c69e7042f63c9dc8de63fba6c9c /bitbake
parente39d89e934a306680b552f8507ee542db72d6672 (diff)
downloadpoky-de7c939a7f15f1800a56261303672fa0e5c740c7.tar.gz
bitbake: runqueue.py: improve printing dependent tasks
Print names instead of Task-IDs (and not mentioning they're task ids). Previously we printed e.g.: Dependency loop #1 found: Task 89 (/there/src/oe/openembedded/recipes/busybox/busybox-native_1.15.2.bb, do_configure) (depends: Set([88, 282, 92, 87])) Now we say Dependency loop #1 found: Task 89 (/there/src/oe/openembedded/recipes/busybox/busybox-native_1.15.2.bb, do_configure) (dependent Task-IDs ['busybox-native, do_patch', 'update-rc.d, do_populate_staging', 'busybox-native, do_populate_staging', 'shasum-native.bb, do_populate_staging', 'busybox-native, do_unpack']) (Bitbake rev: 00eaf76fdc32eb515995b47dfa69eb90ca904b37) Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/runqueue.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 3a438894b8..f315b5d40a 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -175,9 +175,17 @@ class RunQueue:
175 self.runq_task = [] 175 self.runq_task = []
176 self.runq_depends = [] 176 self.runq_depends = []
177 self.runq_revdeps = [] 177 self.runq_revdeps = []
178
179 self.state = runQueuePrepare 178 self.state = runQueuePrepare
180 179
180 def runq_depends_names(self, ids):
181 import re
182 ret = []
183 for id in self.runq_depends[ids]:
184 nam = os.path.basename(self.get_user_idstring(id))
185 nam = re.sub("_[^,]*,", ",", nam)
186 ret.extend([nam])
187 return ret
188
181 def get_user_idstring(self, task): 189 def get_user_idstring(self, task):
182 fn = self.taskData.fn_index[self.runq_fnid[task]] 190 fn = self.taskData.fn_index[self.runq_fnid[task]]
183 taskname = self.runq_task[task] 191 taskname = self.runq_task[task]
@@ -248,7 +256,7 @@ class RunQueue:
248 valid_chains.append(new_chain) 256 valid_chains.append(new_chain)
249 msgs.append("Dependency loop #%d found:\n" % len(valid_chains)) 257 msgs.append("Dependency loop #%d found:\n" % len(valid_chains))
250 for dep in new_chain: 258 for dep in new_chain:
251 msgs.append(" Task %s (%s) (depends: %s)\n" % (dep, self.get_user_idstring(dep), self.runq_depends[dep])) 259 msgs.append(" Task %s (%s) (dependent Tasks %s)\n" % (dep, self.get_user_idstring(dep), self.runq_depends_names(dep)))
252 msgs.append("\n") 260 msgs.append("\n")
253 if len(valid_chains) > 10: 261 if len(valid_chains) > 10:
254 msgs.append("Aborted dependency loops search after 10 matches.\n") 262 msgs.append("Aborted dependency loops search after 10 matches.\n")