[oe-commits] Richard Purdie : lib/oe/classextend: Ensure we don' t extend expressions more than once

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: danny
Commit: 18b401f4f8e931dca08a2e9be34e94c49b5215b9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=18b401f4f8e931dca08a2e9be34e94c49b5215b9

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Nov  6 09:29:00 2012 +0100

lib/oe/classextend: Ensure we don't extend expressions more than once

We could end up with MLPREFIX being prepended to variables like
PACKAGE_DYNAMIC. This patch avoids the problem and unbreaks builds.

[YOCTO #3389]

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/lib/oe/classextend.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index 857a6c9..fe9b566 100644
--- a/meta/lib/oe/classextend.py
+++ b/meta/lib/oe/classextend.py
@@ -40,7 +40,9 @@ class ClassExtender(object):
         var = var.split()
         newvar = []
         for v in var:
-            if v.startswith("^"):
+            if v.startswith("^" + self.extname):
+                newvar.append(v)
+            elif v.startswith("^"):
                 newvar.append("^" + self.extname + "-" + v[1:])
             else:
                 newvar.append(self.extend_name(v))