We can now rely upon the minimum BitBake version having the
SanityCheckFailed event, so remove the code to handle if this is not
there.

Signed-off-by: Paul Eggleton <[email protected]>
---
 meta/classes/sanity.bbclass |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 1210f14..385d733 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).
-- 
1.7.9.5


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to