ConfHandler.py: Apply OVERRIDES before performing immediate expansions

diff --git a/ChangeLog b/ChangeLog
index 70a59a7..b1c7921 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ Changes in Bitbake 1.8.x:
        - Add BB_SRCREV_POLICY variable (clear or cache) to control SRCREV cache
        - Add SRCREV_FORMAT support
        - Fix local fetcher's localpath return values
+       - Apply OVERRIDES before performing immediate expansions
 
 Changes in Bitbake 1.8.6:
        - Correctly redirect stdin when forking

diff --git a/lib/bb/parse/parse_py/ConfHandler.py b/lib/bb/parse/parse_py/ConfHandler.py
index 73b9ff8..6311e76 100644 (file)
--- a/lib/bb/parse/parse_py/ConfHandler.py
+++ b/lib/bb/parse/parse_py/ConfHandler.py
@@ -181,7 +181,9 @@ def feeder(lineno, s, fn, data):
             if val == None:
                 val = groupd["value"]
         elif "colon" in groupd and groupd["colon"] != None:
-            val = bb.data.expand(groupd["value"], data)
+            e = data.createCopy()
+            bb.data.update_data(e)
+            val = bb.data.expand(groupd["value"], e)
         elif "append" in groupd and groupd["append"] != None:
             val = "%s %s" % ((getFunc(groupd, key, data) or ""), groupd["value"])
         elif "prepend" in groupd and groupd["prepend"] != None: