diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-30 18:40:32 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-31 09:51:18 +0000 |
commit | 33f67ee2fc0e5bce5639d75e618371df6fb1b002 (patch) | |
tree | b9b4737104e6535d70186652f4abccba8d29201e | |
parent | b75330e99bf41da1854accaa99ea5cb942367e2b (diff) | |
download | poky-33f67ee2fc0e5bce5639d75e618371df6fb1b002.tar.gz |
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.bbclass | 14 | ||||
-rw-r--r-- | meta/classes/poky-autobuild-notifier.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/sanity.bbclass | 3 | ||||
-rw-r--r-- | meta/classes/tinderclient.bbclass | 6 |
4 files changed, 10 insertions, 19 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index 0378790f70..1866f98561 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass | |||
@@ -3,8 +3,6 @@ require conf/distro/include/distro_tracking_fields.inc | |||
3 | 3 | ||
4 | addhandler distro_eventhandler | 4 | addhandler distro_eventhandler |
5 | python distro_eventhandler() { | 5 | python distro_eventhandler() { |
6 | from bb.event import Handled, NotHandled | ||
7 | # if bb.event.getName(e) == "TaskStarted": | ||
8 | 6 | ||
9 | if bb.event.getName(e) == "BuildStarted": | 7 | if bb.event.getName(e) == "BuildStarted": |
10 | """initialize log files.""" | 8 | """initialize log files.""" |
@@ -25,7 +23,7 @@ python distro_eventhandler() { | |||
25 | f.close() | 23 | f.close() |
26 | bb.utils.unlockfile(lf) | 24 | bb.utils.unlockfile(lf) |
27 | 25 | ||
28 | return NotHandled | 26 | return |
29 | } | 27 | } |
30 | 28 | ||
31 | addtask distrodata_np | 29 | addtask distrodata_np |
@@ -213,9 +211,6 @@ do_distrodataall() { | |||
213 | 211 | ||
214 | addhandler checkpkg_eventhandler | 212 | addhandler checkpkg_eventhandler |
215 | python checkpkg_eventhandler() { | 213 | python checkpkg_eventhandler() { |
216 | from bb.event import Handled, NotHandled | ||
217 | # if bb.event.getName(e) == "TaskStarted": | ||
218 | |||
219 | if bb.event.getName(e) == "BuildStarted": | 214 | if bb.event.getName(e) == "BuildStarted": |
220 | """initialize log files.""" | 215 | """initialize log files.""" |
221 | logpath = bb.data.getVar('LOG_DIR', e.data, 1) | 216 | logpath = bb.data.getVar('LOG_DIR', e.data, 1) |
@@ -235,7 +230,7 @@ python checkpkg_eventhandler() { | |||
235 | f.close() | 230 | f.close() |
236 | bb.utils.unlockfile(lf) | 231 | bb.utils.unlockfile(lf) |
237 | 232 | ||
238 | return NotHandled | 233 | return |
239 | } | 234 | } |
240 | 235 | ||
241 | addtask checkpkg | 236 | addtask checkpkg |
@@ -625,9 +620,6 @@ do_checkpkgall() { | |||
625 | 620 | ||
626 | #addhandler check_eventhandler | 621 | #addhandler check_eventhandler |
627 | python check_eventhandler() { | 622 | python check_eventhandler() { |
628 | from bb.event import Handled, NotHandled | ||
629 | # if bb.event.getName(e) == "TaskStarted": | ||
630 | |||
631 | if bb.event.getName(e) == "BuildStarted": | 623 | if bb.event.getName(e) == "BuildStarted": |
632 | import oe.distro_check as dc | 624 | import oe.distro_check as dc |
633 | tmpdir = bb.data.getVar('TMPDIR', e.data, 1) | 625 | tmpdir = bb.data.getVar('TMPDIR', e.data, 1) |
@@ -645,7 +637,7 @@ python check_eventhandler() { | |||
645 | os.symlink(logfile, slogfile) | 637 | os.symlink(logfile, slogfile) |
646 | bb.data.setVar('LOG_FILE', logfile, e.data) | 638 | bb.data.setVar('LOG_FILE', logfile, e.data) |
647 | 639 | ||
648 | return NotHandled | 640 | return |
649 | } | 641 | } |
650 | 642 | ||
651 | addtask distro_check | 643 | addtask distro_check |
diff --git a/meta/classes/poky-autobuild-notifier.bbclass b/meta/classes/poky-autobuild-notifier.bbclass index 24b85c4612..9ab3d064ed 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): | |||
48 | addhandler poky_autobuilder_notifier_eventhandler | 48 | addhandler poky_autobuilder_notifier_eventhandler |
49 | python poky_autobuilder_notifier_eventhandler() { | 49 | python poky_autobuilder_notifier_eventhandler() { |
50 | from bb import note, error, data | 50 | from bb import note, error, data |
51 | from bb.event import NotHandled, getName | 51 | from bb.event import getName |
52 | 52 | ||
53 | if e.data is None: | 53 | if e.data is None: |
54 | return NotHandled | 54 | return |
55 | 55 | ||
56 | name = getName(e) | 56 | name = getName(e) |
57 | 57 | ||
58 | if name == "TaskFailed": | 58 | if name == "TaskFailed": |
59 | do_autobuilder_failure_report(e) | 59 | do_autobuilder_failure_report(e) |
60 | 60 | ||
61 | return NotHandled | 61 | return |
62 | } | 62 | } |
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index e9217f9c0d..46c6ec26e3 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -312,9 +312,8 @@ def check_sanity(e): | |||
312 | 312 | ||
313 | addhandler check_sanity_eventhandler | 313 | addhandler check_sanity_eventhandler |
314 | python check_sanity_eventhandler() { | 314 | python check_sanity_eventhandler() { |
315 | from bb.event import Handled, NotHandled | ||
316 | if bb.event.getName(e) == "ConfigParsed" and bb.data.getVar("BB_WORKERCONTEXT", e.data, True) != "1": | 315 | if bb.event.getName(e) == "ConfigParsed" and bb.data.getVar("BB_WORKERCONTEXT", e.data, True) != "1": |
317 | check_sanity(e) | 316 | check_sanity(e) |
318 | 317 | ||
319 | return NotHandled | 318 | return |
320 | } | 319 | } |
diff --git a/meta/classes/tinderclient.bbclass b/meta/classes/tinderclient.bbclass index 28df0f9505..1027c7cef4 100644 --- a/meta/classes/tinderclient.bbclass +++ b/meta/classes/tinderclient.bbclass | |||
@@ -367,14 +367,14 @@ def tinder_do_tinder_report(event): | |||
367 | addhandler tinderclient_eventhandler | 367 | addhandler tinderclient_eventhandler |
368 | python tinderclient_eventhandler() { | 368 | python tinderclient_eventhandler() { |
369 | from bb import note, error, data | 369 | from bb import note, error, data |
370 | from bb.event import NotHandled, getName | 370 | from bb.event import getName |
371 | 371 | ||
372 | if e.data is None or getName(e) == "MsgNote": | 372 | if e.data is None or getName(e) == "MsgNote": |
373 | return NotHandled | 373 | return |
374 | 374 | ||
375 | do_tinder_report = data.getVar('TINDER_REPORT', e.data, True) | 375 | do_tinder_report = data.getVar('TINDER_REPORT', e.data, True) |
376 | if do_tinder_report and do_tinder_report == "1": | 376 | if do_tinder_report and do_tinder_report == "1": |
377 | tinder_do_tinder_report(e) | 377 | tinder_do_tinder_report(e) |
378 | 378 | ||
379 | return NotHandled | 379 | return |
380 | } | 380 | } |