diff options
author | Robert Bradford <rob@openedhand.com> | 2008-10-20 11:35:49 +0000 |
---|---|---|
committer | Robert Bradford <rob@openedhand.com> | 2008-10-20 11:35:49 +0000 |
commit | f105cdc88a735b6e0a0b1b0c5a0bd3931a5ad9c3 (patch) | |
tree | 28c6a3b1602603b31bba81b085dc00330e47faab /bitbake-dev/lib | |
parent | a8644924ab92b090546df1869714b57ba91fcd8b (diff) | |
download | poky-f105cdc88a735b6e0a0b1b0c5a0bd3931a5ad9c3.tar.gz |
bitbake-dev: Remove the Pkg{Started, Failed, Succeeded} events and their handling in the UI
These events are superfluous now that BB operates on a task level granularity.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5541 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake-dev/lib')
-rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 4 | ||||
-rw-r--r-- | bitbake-dev/lib/bb/event.py | 12 | ||||
-rw-r--r-- | bitbake-dev/lib/bb/ui/knotty.py | 3 | ||||
-rw-r--r-- | bitbake-dev/lib/bb/ui/ncurses.py | 2 |
4 files changed, 0 insertions, 21 deletions
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index 6d04d38080..e3bb56d376 100644 --- a/bitbake-dev/lib/bb/cooker.py +++ b/bitbake-dev/lib/bb/cooker.py | |||
@@ -183,20 +183,16 @@ class BBCooker: | |||
183 | """ | 183 | """ |
184 | Build one task of a package, optionally build following task depends | 184 | Build one task of a package, optionally build following task depends |
185 | """ | 185 | """ |
186 | bb.event.fire(bb.event.PkgStarted(item, the_data)) | ||
187 | try: | 186 | try: |
188 | if not self.configuration.dry_run: | 187 | if not self.configuration.dry_run: |
189 | bb.build.exec_task('do_%s' % task, the_data) | 188 | bb.build.exec_task('do_%s' % task, the_data) |
190 | bb.event.fire(bb.event.PkgSucceeded(item, the_data)) | ||
191 | return True | 189 | return True |
192 | except bb.build.FuncFailed: | 190 | except bb.build.FuncFailed: |
193 | bb.msg.error(bb.msg.domain.Build, "task stack execution failed") | 191 | bb.msg.error(bb.msg.domain.Build, "task stack execution failed") |
194 | bb.event.fire(bb.event.PkgFailed(item, the_data)) | ||
195 | raise | 192 | raise |
196 | except bb.build.EventException, e: | 193 | except bb.build.EventException, e: |
197 | event = e.args[1] | 194 | event = e.args[1] |
198 | bb.msg.error(bb.msg.domain.Build, "%s event exception, aborting" % bb.event.getName(event)) | 195 | bb.msg.error(bb.msg.domain.Build, "%s event exception, aborting" % bb.event.getName(event)) |
199 | bb.event.fire(bb.event.PkgFailed(item, the_data)) | ||
200 | raise | 196 | raise |
201 | 197 | ||
202 | def tryBuild(self, fn): | 198 | def tryBuild(self, fn): |
diff --git a/bitbake-dev/lib/bb/event.py b/bitbake-dev/lib/bb/event.py index c13a0127a5..e5cae275ac 100644 --- a/bitbake-dev/lib/bb/event.py +++ b/bitbake-dev/lib/bb/event.py | |||
@@ -208,18 +208,6 @@ class DepBase(PkgBase): | |||
208 | dep = property(getDep, setDep, None, "dep property") | 208 | dep = property(getDep, setDep, None, "dep property") |
209 | 209 | ||
210 | 210 | ||
211 | class PkgStarted(PkgBase): | ||
212 | """Package build started""" | ||
213 | |||
214 | |||
215 | class PkgFailed(PkgBase): | ||
216 | """Package build failed""" | ||
217 | |||
218 | |||
219 | class PkgSucceeded(PkgBase): | ||
220 | """Package build completed""" | ||
221 | |||
222 | |||
223 | class BuildStarted(BuildBase): | 211 | class BuildStarted(BuildBase): |
224 | """bbmake build run started""" | 212 | """bbmake build run started""" |
225 | 213 | ||
diff --git a/bitbake-dev/lib/bb/ui/knotty.py b/bitbake-dev/lib/bb/ui/knotty.py index 9e89660307..5e7544ea03 100644 --- a/bitbake-dev/lib/bb/ui/knotty.py +++ b/bitbake-dev/lib/bb/ui/knotty.py | |||
@@ -56,9 +56,6 @@ def init(server, eventHandler): | |||
56 | if event is None: | 56 | if event is None: |
57 | continue | 57 | continue |
58 | #print event | 58 | #print event |
59 | if event[0].startswith('bb.event.Pkg'): | ||
60 | print "NOTE: %s" % event[1]['_message'] | ||
61 | continue | ||
62 | if event[0].startswith('bb.msg.MsgPlain'): | 59 | if event[0].startswith('bb.msg.MsgPlain'): |
63 | print event[1]['_message'] | 60 | print event[1]['_message'] |
64 | continue | 61 | continue |
diff --git a/bitbake-dev/lib/bb/ui/ncurses.py b/bitbake-dev/lib/bb/ui/ncurses.py index 866792b14f..3cac264648 100644 --- a/bitbake-dev/lib/bb/ui/ncurses.py +++ b/bitbake-dev/lib/bb/ui/ncurses.py | |||
@@ -245,8 +245,6 @@ class NCursesUI: | |||
245 | continue | 245 | continue |
246 | helper.eventHandler(event) | 246 | helper.eventHandler(event) |
247 | #mw.appendText("%s\n" % event[0]) | 247 | #mw.appendText("%s\n" % event[0]) |
248 | if event[0].startswith('bb.event.Pkg'): | ||
249 | mw.appendText("NOTE: %s\n" % event[1]['_message']) | ||
250 | if event[0].startswith('bb.build.Task'): | 248 | if event[0].startswith('bb.build.Task'): |
251 | mw.appendText("NOTE: %s\n" % event[1]['_message']) | 249 | mw.appendText("NOTE: %s\n" % event[1]['_message']) |
252 | if event[0].startswith('bb.msg.MsgDebug'): | 250 | if event[0].startswith('bb.msg.MsgDebug'): |