From 4c386e1dd5df8e1bfb675f1a7f47c1162ec76d07 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 11 Jun 2015 23:11:05 +0100 Subject: bitbake: data_smart: Fix appendVar/prependVar Now that overrides get expanded 'on the fly', change appendVar and prependVar to work using _append and _prepend, else we'd have to re-implement pieces of getVar and the timing of expansions becomes problematic. Using _append/_prepend equivalence gives the behaviour users likley expect from these functions. (Bitbake rev: 40d661aaf7a563c6447b073310c5f2fdae6ca3d0) Signed-off-by: Richard Purdie --- bitbake/lib/bb/data_smart.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index b7ccab767e..7755f1afd8 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -540,14 +540,12 @@ class DataSmart(MutableMapping): def appendVar(self, var, value, **loginfo): loginfo['op'] = 'append' self.varhistory.record(**loginfo) - newvalue = (self.getVar(var, False) or "") + value - self.setVar(var, newvalue, ignore=True) + self.setVar(var + "_append", value, ignore=True, parsing=True) def prependVar(self, var, value, **loginfo): loginfo['op'] = 'prepend' self.varhistory.record(**loginfo) - newvalue = value + (self.getVar(var, False) or "") - self.setVar(var, newvalue, ignore=True) + self.setVar(var + "_prepend", value, ignore=True, parsing=True) def delVar(self, var, **loginfo): loginfo['detail'] = "" -- cgit v1.2.3-54-g00ecf