summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-12-30 18:40:32 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-31 09:51:18 +0000
commit33f67ee2fc0e5bce5639d75e618371df6fb1b002 (patch)
treeb9b4737104e6535d70186652f4abccba8d29201e
parentb75330e99bf41da1854accaa99ea5cb942367e2b (diff)
downloadopenembedded-core-33f67ee2fc0e5bce5639d75e618371df6fb1b002.tar.gz
openembedded-core-33f67ee2fc0e5bce5639d75e618371df6fb1b002.tar.bz2
openembedded-core-33f67ee2fc0e5bce5639d75e618371df6fb1b002.tar.xz
openembedded-core-33f67ee2fc0e5bce5639d75e618371df6fb1b002.zip
classes: Drop Handled/NotHandled eventhandler keywords, they don't do anything
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/classes/distrodata.bbclass14
-rw-r--r--meta/classes/poky-autobuild-notifier.bbclass6
-rw-r--r--meta/classes/sanity.bbclass3
-rw-r--r--meta/classes/tinderclient.bbclass6
4 files changed, 10 insertions, 19 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 0378790f7..1866f9856 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -3,8 +3,6 @@ require conf/distro/include/distro_tracking_fields.inc
addhandler distro_eventhandler
python distro_eventhandler() {
- from bb.event import Handled, NotHandled
- # if bb.event.getName(e) == "TaskStarted":
if bb.event.getName(e) == "BuildStarted":
"""initialize log files."""
@@ -25,7 +23,7 @@ python distro_eventhandler() {
f.close()
bb.utils.unlockfile(lf)
- return NotHandled
+ return
}
addtask distrodata_np
@@ -213,9 +211,6 @@ do_distrodataall() {
addhandler checkpkg_eventhandler
python checkpkg_eventhandler() {
- from bb.event import Handled, NotHandled
- # if bb.event.getName(e) == "TaskStarted":
-
if bb.event.getName(e) == "BuildStarted":
"""initialize log files."""
logpath = bb.data.getVar('LOG_DIR', e.data, 1)
@@ -235,7 +230,7 @@ python checkpkg_eventhandler() {
f.close()
bb.utils.unlockfile(lf)
- return NotHandled
+ return
}
addtask checkpkg
@@ -625,9 +620,6 @@ do_checkpkgall() {
#addhandler check_eventhandler
python check_eventhandler() {
- from bb.event import Handled, NotHandled
- # if bb.event.getName(e) == "TaskStarted":
-
if bb.event.getName(e) == "BuildStarted":
import oe.distro_check as dc
tmpdir = bb.data.getVar('TMPDIR', e.data, 1)
@@ -645,7 +637,7 @@ python check_eventhandler() {
os.symlink(logfile, slogfile)
bb.data.setVar('LOG_FILE', logfile, e.data)
- return NotHandled
+ return
}
addtask distro_check
diff --git a/meta/classes/poky-autobuild-notifier.bbclass b/meta/classes/poky-autobuild-notifier.bbclass
index 24b85c461..9ab3d064e 100644
--- a/meta/classes/poky-autobuild-notifier.bbclass
+++ b/meta/classes/poky-autobuild-notifier.bbclass
@@ -48,15 +48,15 @@ def do_autobuilder_failure_report(event):
addhandler poky_autobuilder_notifier_eventhandler
python poky_autobuilder_notifier_eventhandler() {
from bb import note, error, data
- from bb.event import NotHandled, getName
+ from bb.event import getName
if e.data is None:
- return NotHandled
+ return
name = getName(e)
if name == "TaskFailed":
do_autobuilder_failure_report(e)
- return NotHandled
+ return
}
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index e9217f9c0..46c6ec26e 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -312,9 +312,8 @@ def check_sanity(e):
addhandler check_sanity_eventhandler
python check_sanity_eventhandler() {
- from bb.event import Handled, NotHandled
if bb.event.getName(e) == "ConfigParsed" and bb.data.getVar("BB_WORKERCONTEXT", e.data, True) != "1":
check_sanity(e)
- return NotHandled
+ return
}
diff --git a/meta/classes/tinderclient.bbclass b/meta/classes/tinderclient.bbclass
index 28df0f950..1027c7cef 100644
--- a/meta/classes/tinderclient.bbclass
+++ b/meta/classes/tinderclient.bbclass
@@ -367,14 +367,14 @@ def tinder_do_tinder_report(event):
addhandler tinderclient_eventhandler
python tinderclient_eventhandler() {
from bb import note, error, data
- from bb.event import NotHandled, getName
+ from bb.event import getName
if e.data is None or getName(e) == "MsgNote":
- return NotHandled
+ return
do_tinder_report = data.getVar('TINDER_REPORT', e.data, True)
if do_tinder_report and do_tinder_report == "1":
tinder_do_tinder_report(e)
- return NotHandled
+ return
}