From 18cec169ad86f25fcc90352742c4d75dd297214e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 12 Aug 2007 17:06:00 +0000 Subject: [PATCH] ConfHandler.py: Apply OVERRIDES before performing immediate expansions --- ChangeLog | 1 + lib/bb/parse/parse_py/ConfHandler.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 70a59a7..b1c7921 100644 --- 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 --- 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: -- 2.7.4