summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-21 16:16:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-22 12:59:55 (GMT)
commit49bc007c80e429090c4db51e30c5ce27e8a72558 (patch)
treef2099283495090ed38abd82e901aec654d66eab1 /bitbake/lib
parent164083d31f7b8d1ea96b31ed3c13bddcc42961f6 (diff)
downloadpoky-49bc007c80e429090c4db51e30c5ce27e8a72558.tar.gz
bitbake: data-smart: rename the 'content' internal variable to '_content'
(Bitbake rev: 684cf09aed09ec82c8afb99895f92d73cd0519df) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/data_smart.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 31216e0..dbfcefb 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -280,10 +280,10 @@ class DataSmart(MutableMapping):
280 self._seen_overrides[override].add( var ) 280 self._seen_overrides[override].add( var )
281 281
282 # setting var 282 # setting var
283 self.dict[var]["content"] = value 283 self.dict[var]["_content"] = value
284 284
285 def getVar(self, var, expand=False, noweakdefault=False): 285 def getVar(self, var, expand=False, noweakdefault=False):
286 value = self.getVarFlag(var, "content", False, noweakdefault) 286 value = self.getVarFlag(var, "_content", False, noweakdefault)
287 287
288 # Call expand() separately to make use of the expand cache 288 # Call expand() separately to make use of the expand cache
289 if expand and value: 289 if expand and value:
@@ -340,7 +340,7 @@ class DataSmart(MutableMapping):
340 if local_var: 340 if local_var:
341 if flag in local_var: 341 if flag in local_var:
342 value = copy.copy(local_var[flag]) 342 value = copy.copy(local_var[flag])
343 elif flag == "content" and "defaultval" in local_var and not noweakdefault: 343 elif flag == "_content" and "defaultval" in local_var and not noweakdefault:
344 value = copy.copy(local_var["defaultval"]) 344 value = copy.copy(local_var["defaultval"])
345 if expand and value: 345 if expand and value:
346 value = self.expand(value, None) 346 value = self.expand(value, None)
@@ -369,7 +369,7 @@ class DataSmart(MutableMapping):
369 self._makeShadowCopy(var) 369 self._makeShadowCopy(var)
370 370
371 for i in flags: 371 for i in flags:
372 if i == "content": 372 if i == "_content":
373 continue 373 continue
374 self.dict[var][i] = flags[i] 374 self.dict[var][i] = flags[i]
375 375
@@ -379,7 +379,7 @@ class DataSmart(MutableMapping):
379 379
380 if local_var: 380 if local_var:
381 for i in local_var: 381 for i in local_var:
382 if i == "content": 382 if i == "_content":
383 continue 383 continue
384 flags[i] = local_var[i] 384 flags[i] = local_var[i]
385 385
@@ -396,10 +396,10 @@ class DataSmart(MutableMapping):
396 content = None 396 content = None
397 397
398 # try to save the content 398 # try to save the content
399 if "content" in self.dict[var]: 399 if "_content" in self.dict[var]:
400 content = self.dict[var]["content"] 400 content = self.dict[var]["_content"]
401 self.dict[var] = {} 401 self.dict[var] = {}
402 self.dict[var]["content"] = content 402 self.dict[var]["_content"] = content
403 else: 403 else:
404 del self.dict[var] 404 del self.dict[var]
405 405