From de69c6c94ef91182422b35374ea0d18d249fccf0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 11 Sep 2012 10:40:15 +0100 Subject: classes/sanity: remove obsolete code We can now rely upon the minimum BitBake version having the SanityCheckFailed event, so remove the code to handle if this is not there. (From OE-Core rev: ba17572c9c11efb45a92ba97914ce1f6d84002c8) Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'meta') diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 1210f14ddc..385d7339d3 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -6,13 +6,8 @@ SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar gzip gawk ch def raise_sanity_error(msg, d): if d.getVar("SANITY_USE_EVENTS", True) == "1": - # FIXME: handle when BitBake version is too old to support bb.event.SanityCheckFailed - # We can just fire the event directly once the minimum version is bumped beyond 1.15.1 - try: - bb.event.fire(bb.event.SanityCheckFailed(msg), d) - return - except AttributeError: - pass + bb.event.fire(bb.event.SanityCheckFailed(msg), d) + return bb.fatal(""" OE-core's config sanity checker detected a potential misconfiguration. Either fix the cause of this error or at your own risk disable the checker (see sanity.conf). -- cgit v1.2.3-54-g00ecf