| Submitter | Bernhard Reutner-Fischer |
|---|---|
| Date | 2009-10-20 20:56:38 |
| Message ID | <1256072198-4449-1-git-send-email-rep.dot.nop@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/1135/ |
| State | Applied, archived |
| Headers | show |
Comments
PING ? On Tue, Oct 20, 2009 at 10:56:38PM +0200, Bernhard Reutner-Fischer wrote: >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 Tasks ['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']) > >Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> >--- > lib/bb/runqueue.py | 12 ++++++++++-- > 1 files changed, 10 insertions(+), 2 deletions(-) > >diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py >index 8b6e12d..df6e673 100644 >--- a/lib/bb/runqueue.py >+++ b/lib/bb/runqueue.py >@@ -174,9 +174,17 @@ class RunQueue: > self.runq_task = [] > self.runq_depends = [] > self.runq_revdeps = [] >- > self.state = runQueuePrepare > >+ def runq_depends_names(self, ids): >+ import re >+ ret = [] >+ for id in self.runq_depends[ids]: >+ nam = os.path.basename(self.get_user_idstring(id)) >+ nam = re.sub("_[^,]*,", ",", nam) >+ ret.extend([nam]) >+ return ret >+ > def get_user_idstring(self, task): > fn = self.taskData.fn_index[self.runq_fnid[task]] > taskname = self.runq_task[task] >@@ -247,7 +255,7 @@ class RunQueue: > valid_chains.append(new_chain) > msgs.append("Dependency loop #%d found:\n" % len(valid_chains)) > for dep in new_chain: >- msgs.append(" Task %s (%s) (depends: %s)\n" % (dep, self.get_user_idstring(dep), self.runq_depends[dep])) >+ msgs.append(" Task %s (%s) (dependent Tasks %s)\n" % (dep, self.get_user_idstring(dep), self.runq_depends_names(dep))) > msgs.append("\n") > if len(valid_chains) > 10: > msgs.append("Aborted dependency loops search after 10 matches.\n") >-- >1.6.5 >
On Mon, 2009-11-23 at 10:18 +0100, Bernhard Reutner-Fischer wrote: > PING ? > > On Tue, Oct 20, 2009 at 10:56:38PM +0200, Bernhard Reutner-Fischer wrote: > >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 Tasks ['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']) It seems a bit weird to leave "Task 89" printed numerically if you are going to expand all the others to text. I'd have thought we would want them all to be consistent. That aside, though, this is a bitbake patch and you should probably send it to the bitbake-dev list rather than openembedded-devel. p.
Patch
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 8b6e12d..df6e673 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -174,9 +174,17 @@ class RunQueue: self.runq_task = [] self.runq_depends = [] self.runq_revdeps = [] - self.state = runQueuePrepare + def runq_depends_names(self, ids): + import re + ret = [] + for id in self.runq_depends[ids]: + nam = os.path.basename(self.get_user_idstring(id)) + nam = re.sub("_[^,]*,", ",", nam) + ret.extend([nam]) + return ret + def get_user_idstring(self, task): fn = self.taskData.fn_index[self.runq_fnid[task]] taskname = self.runq_task[task] @@ -247,7 +255,7 @@ class RunQueue: valid_chains.append(new_chain) msgs.append("Dependency loop #%d found:\n" % len(valid_chains)) for dep in new_chain: - msgs.append(" Task %s (%s) (depends: %s)\n" % (dep, self.get_user_idstring(dep), self.runq_depends[dep])) + msgs.append(" Task %s (%s) (dependent Tasks %s)\n" % (dep, self.get_user_idstring(dep), self.runq_depends_names(dep))) msgs.append("\n") if len(valid_chains) > 10: msgs.append("Aborted dependency loops search after 10 matches.\n")
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']) Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> --- lib/bb/runqueue.py | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)