[oe-commits] Paul Eggleton : classes/sanity: remove obsolete code

git at git.openembedded.org git at git.openembedded.org
Wed Sep 12 13:53:47 UTC 2012

Module: openembedded-core.git
Branch: master
Commit: ba17572c9c11efb45a92ba97914ce1f6d84002c8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ba17572c9c11efb45a92ba97914ce1f6d84002c8

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Tue Sep 11 10:40:15 2012 +0100

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

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>


 meta/classes/sanity.bbclass |    9 ++-------
 1 files 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).

More information about the Openembedded-commits mailing list