summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/data_smart.py
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-12-15 22:13:52 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-12-16 08:39:47 +0000
commit459861b9c039cba764e3e453fa34d4d4a4566e4f (patch)
tree21b2d3e2c920d9ae5a9f3d16636ef94e1baf1088 /bitbake/lib/bb/data_smart.py
parent71e21a72cd2b6cd6dedfa4779f5f2f4d8ad1f8e7 (diff)
downloadpoky-459861b9c039cba764e3e453fa34d4d4a4566e4f.tar.gz
bitbake/data_smart.py: Fix error where update-rc.d would not get added to the dependency tree
If there was a variable such as: X_${Y}_append = "Z" The "Z" would be lost if X_${Y} was unset. This was due to a bug in the renameVar function used by expandKeys(). Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/data_smart.py')
-rw-r--r--bitbake/lib/bb/data_smart.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index c93aea7fef..988d5c3578 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -171,14 +171,15 @@ class DataSmart:
171 Rename the variable key to newkey 171 Rename the variable key to newkey
172 """ 172 """
173 val = self.getVar(key, 0) 173 val = self.getVar(key, 0)
174 if val is None: 174 if val is not None:
175 return 175 self.setVar(newkey, val)
176
177 self.setVar(newkey, val)
178 176
179 for i in ('_append', '_prepend'): 177 for i in ('_append', '_prepend'):
178 src = self.getVarFlag(key, i)
179 if src is None:
180 continue
181
180 dest = self.getVarFlag(newkey, i) or [] 182 dest = self.getVarFlag(newkey, i) or []
181 src = self.getVarFlag(key, i) or []
182 dest.extend(src) 183 dest.extend(src)
183 self.setVarFlag(newkey, i, dest) 184 self.setVarFlag(newkey, i, dest)
184 185