summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-12-01 20:50:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-03 12:24:00 +0000
commitb92ec90ea40639d79c491f5a0b5a0f3e4dfa6708 (patch)
treebc3ed011b9dd54cfe79fa68e0fd90b1472abac45 /bitbake/lib
parent13322986a6e07a3523405e5c41cedce4022db032 (diff)
downloadpoky-b92ec90ea40639d79c491f5a0b5a0f3e4dfa6708.tar.gz
bitbake: data: rename defaultval to _defaultval
The defaultval field is intended to be internal and the only use of that field outside of data.py is to skip over it when iterating over a value's flags. For clarity and convenience, rename the field to _defaultval so that it is considered internal and not exposed through the data API. (Bitbake rev: 2800958dadaa5c055ba21d52c98d842d360f0785) 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.py6
-rw-r--r--bitbake/lib/bb/parse/ast.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 9a42a17062..31ce9a5d15 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -589,7 +589,7 @@ class DataSmart(MutableMapping):
589 self._makeShadowCopy(var) 589 self._makeShadowCopy(var)
590 self.dict[var][flag] = value 590 self.dict[var][flag] = value
591 591
592 if flag == "defaultval" and '_' in var: 592 if flag == "_defaultval" and '_' in var:
593 self._setvar_update_overrides(var) 593 self._setvar_update_overrides(var)
594 594
595 if flag == "unexport" or flag == "export": 595 if flag == "unexport" or flag == "export":
@@ -605,8 +605,8 @@ class DataSmart(MutableMapping):
605 if local_var is not None: 605 if local_var is not None:
606 if flag in local_var: 606 if flag in local_var:
607 value = copy.copy(local_var[flag]) 607 value = copy.copy(local_var[flag])
608 elif flag == "_content" and "defaultval" in local_var and not noweakdefault: 608 elif flag == "_content" and "_defaultval" in local_var and not noweakdefault:
609 value = copy.copy(local_var["defaultval"]) 609 value = copy.copy(local_var["_defaultval"])
610 if expand and value: 610 if expand and value:
611 # Only getvar (flag == _content) hits the expand cache 611 # Only getvar (flag == _content) hits the expand cache
612 cachename = None 612 cachename = None
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index 4e5a06e761..af42a0c0d6 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -128,7 +128,7 @@ class DataNode(AstNode):
128 if 'flag' in groupd and groupd['flag'] != None: 128 if 'flag' in groupd and groupd['flag'] != None:
129 flag = groupd['flag'] 129 flag = groupd['flag']
130 elif groupd["lazyques"]: 130 elif groupd["lazyques"]:
131 flag = "defaultval" 131 flag = "_defaultval"
132 132
133 loginfo['op'] = op 133 loginfo['op'] = op
134 loginfo['detail'] = groupd["value"] 134 loginfo['detail'] = groupd["value"]