diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-19 15:33:31 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-19 15:34:01 +0000 |
commit | b65e8ec5931afbfcb29482db5a3afb9a752166cf (patch) | |
tree | 4eecc2d466e0e7d68e2a73c348c9051a36df9fbd /bitbake-dev/lib/bb/data_smart.py | |
parent | 43788606bda9bef3e0c796271af8a03e01d9853d (diff) | |
download | poky-b65e8ec5931afbfcb29482db5a3afb9a752166cf.tar.gz |
bitbake-dev: Sync again with upstream after fixes from Poky bitbake 1.8 were merged
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake-dev/lib/bb/data_smart.py')
-rw-r--r-- | bitbake-dev/lib/bb/data_smart.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bitbake-dev/lib/bb/data_smart.py b/bitbake-dev/lib/bb/data_smart.py index c93aea7fef..988d5c3578 100644 --- a/bitbake-dev/lib/bb/data_smart.py +++ b/bitbake-dev/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 | ||