merge of '4a597627acd6eec179bb1a03405d92cf8b871ac0'

     and '6c89e16689bde0d5bff8b0e47eea04a458190a56'

1 files changed, 10 insertions, 0 deletions

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index a0da0667dd..016b0d500b 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -111,6 +111,16 @@ python check_sanity_eventhandler() {
     from bb import note, error, data, __version__
     from bb.event import getName
 
+    try:
+        from distutils.version import LooseVersion
+    except ImportError:
+        def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
+
+    if (LooseVersion(bb.__version__) > LooseVersion("1.8.6")):
+        if getName(e) == "ConfigParsed":
+            check_sanity(e)
+        return NotHandled
+
     if getName(e) == "BuildStarted":
         check_sanity(e)