From: Chris Larson <chris_larson@mentor.com>
Date: Fri, 9 Apr 2010 00:24:49 +0000 (-0700)
Subject: task-base: change the 'set' logic to work a bit better
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71d0e0501bb80469ba93e6f5bbdddbe985c0acc0;p=openembedded.git

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 555a463635..bc1324ba86 100644
--- 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())