task-base: change the 'set' logic to work a bit better

Signed-off-by: Chris Larson <chris_larson@mentor.com>

diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb
index 555a463..bc1324b 100644 (file)
--- a/recipes/tasks/task-base.bb
+++ b/recipes/tasks/task-base.bb
@@ -137,9 +137,9 @@ python __anonymous () {
     import bb
 
     try:
-       set
-    except NameError:
-       from sets import Set as set
+        set = __builtins__["set"]
+    except KeyError:
+        from sets import Set as set
 
     distro_features = set(bb.data.getVar("DISTRO_FEATURES", d, 1).split())
     machine_features= set(bb.data.getVar("MACHINE_FEATURES", d, 1).split())