[oe-commits] Jun Zhu : meta/lib/oe/utils.py: Corrected the return value of both_contain ()

[git at git.openembedded.org]

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

Author: Jun Zhu <R01007 at freescale.com>
Date:   Fri Apr  3 22:34:09 2015 +0800

meta/lib/oe/utils.py: Corrected the return value of both_contain()

oe.utils.both_contain() should return the result as "checkvalue" or "",
but the latest implement returns as "set(['checkvalue'])" or "";

It causes that bitbake.conf generates the wrong result of COMBINED_FEATURES,
which contains the common components in both DISTRO_FEATURE and MACHINE_FEATURES.

For example, build in Dizzy branch, COMBINED_FEATURES is "alsa usbhost ...",
but recently, COMBINED_FEATURES is like "set(['alsa']) set(['usbhost']) ...".

Signed-off-by: Jun Zhu <R01007 at freescale.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/lib/oe/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index bedade2..b8224de 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -51,7 +51,7 @@ def both_contain(variable1, variable2, checkvalue, d):
     else:
         checkvalue = set(checkvalue)
     if checkvalue.issubset(val1) and checkvalue.issubset(val2):
-        return checkvalue
+        return " ".join(checkvalue)
     else:
         return ""