From f105cdc88a735b6e0a0b1b0c5a0bd3931a5ad9c3 Mon Sep 17 00:00:00 2001 From: Robert Bradford Date: Mon, 20 Oct 2008 11:35:49 +0000 Subject: 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 --- bitbake-dev/lib/bb/cooker.py | 4 ---- bitbake-dev/lib/bb/event.py | 12 ------------ bitbake-dev/lib/bb/ui/knotty.py | 3 --- bitbake-dev/lib/bb/ui/ncurses.py | 2 -- 4 files changed, 21 deletions(-) (limited to 'bitbake-dev') 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: """ Build one task of a package, optionally build following task depends """ - bb.event.fire(bb.event.PkgStarted(item, the_data)) try: if not self.configuration.dry_run: bb.build.exec_task('do_%s' % task, the_data) - bb.event.fire(bb.event.PkgSucceeded(item, the_data)) return True except bb.build.FuncFailed: bb.msg.error(bb.msg.domain.Build, "task stack execution failed") - bb.event.fire(bb.event.PkgFailed(item, the_data)) raise except bb.build.EventException, e: event = e.args[1] bb.msg.error(bb.msg.domain.Build, "%s event exception, aborting" % bb.event.getName(event)) - bb.event.fire(bb.event.PkgFailed(item, the_data)) raise 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): dep = property(getDep, setDep, None, "dep property") -class PkgStarted(PkgBase): - """Package build started""" - - -class PkgFailed(PkgBase): - """Package build failed""" - - -class PkgSucceeded(PkgBase): - """Package build completed""" - - class BuildStarted(BuildBase): """bbmake build run started""" 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): if event is None: continue #print event - if event[0].startswith('bb.event.Pkg'): - print "NOTE: %s" % event[1]['_message'] - continue if event[0].startswith('bb.msg.MsgPlain'): print event[1]['_message'] 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: continue helper.eventHandler(event) #mw.appendText("%s\n" % event[0]) - if event[0].startswith('bb.event.Pkg'): - mw.appendText("NOTE: %s\n" % event[1]['_message']) if event[0].startswith('bb.build.Task'): mw.appendText("NOTE: %s\n" % event[1]['_message']) if event[0].startswith('bb.msg.MsgDebug'): -- cgit v1.2.3