[oe-commits] org.oe.dev Fixed error in the way the user specified exclusion lists were handled

[ifaistos commit]

Fixed error in the way the user specified exclusion lists were handled
Remove debug messages

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 9bbebb754095353f3763fe66f59709eb8f986b9e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9bbebb754095353f3763fe66f59709eb8f986b9e
Files:
1
classes/icecc.bbclass
Diffs:

#
# mt diff -rc491123fc7829f3a1f1a3760ec80422581017e3b -r9bbebb754095353f3763fe66f59709eb8f986b9e
#
# 
# 
# patch "classes/icecc.bbclass"
#  from [c4fe76d9870c8766682d340ae664ba1d6991b99f]
#    to [61d2e620b82ce09bf35a86e7e4c475fc713cdfe3]
# 
============================================================
--- classes/icecc.bbclass	c4fe76d9870c8766682d340ae664ba1d6991b99f
+++ classes/icecc.bbclass	61d2e620b82ce09bf35a86e7e4c475fc713cdfe3
@@ -232,11 +232,15 @@ def use_icc_version(bb,d):
       icecc_ver = "yes"
       system_class_blacklist = [ "none" ] 
       
-      user_class_blacklist =  bb.data.getVar('ICECC_USER_CLASS_BL', d) or "none"
-      system_class_blacklist = user_class_blacklist.split()
+      for black in system_class_blacklist:
+           if bb.data.inherits_class(black, d):
+              icecc_ver = "no"
 
-      for black in system_class_blacklist:
-           print("Class value is %s " %black)
+
+      user_class_blacklist =  bb.data.getVar('ICECC_USER_CLASS_BL', d) or "none"
+      user_class_blacklist = user_class_blacklist.split()
+      
+      for black in user_class_blacklist:
            if bb.data.inherits_class(black, d):
               icecc_ver = "no"
  
@@ -251,11 +255,15 @@ def icc_path(bb,d,compile):
     #for one reason or the other
     system_package_blacklist = [ "ulibc", "glibc", "qemu" ]
 
+    for black in system_package_blacklist:
+      if black in package_tmp:
+         return ""
+
     #user defined exclusion list
     user_package_blacklist = bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "none"   
-    system_package_blacklist = user_package_blacklist.split()
+    user_package_blacklist = user_package_blacklist.split()
 
-    for black in system_package_blacklist:
+    for black in user_package_blacklist:
       if black in package_tmp:
          return ""