diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2007-08-12 17:06:00 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2007-08-12 17:06:00 +0000 |
| commit | 18cec169ad86f25fcc90352742c4d75dd297214e (patch) | |
| tree | 4e95ccc132b1b8e60d1fde3ee12aaba016d2980f | |
| parent | d12e8d30d80a6a8d359088372ac3a1f74d355311 (diff) | |
| download | bitbake-18cec169ad86f25fcc90352742c4d75dd297214e.tar.gz | |
ConfHandler.py: Apply OVERRIDES before performing immediate expansions
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | lib/bb/parse/parse_py/ConfHandler.py | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -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 73b9ff816..6311e7690 100644 --- 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: |