mirror of
https://git.yoctoproject.org/poky
synced 2026-09-20 03:49:32 +02:00
bitbake: data_smart: Allow rename mechanism to show full expressions
(Bitbake rev: bac6f7acfd2e6b5b4d6d3a8d40beeff76b215751) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -513,12 +513,14 @@ class DataSmart(MutableMapping):
|
|||||||
def hasOverrides(self, var):
|
def hasOverrides(self, var):
|
||||||
return var in self.overridedata
|
return var in self.overridedata
|
||||||
|
|
||||||
def _print_rename_error(self, var, loginfo):
|
def _print_rename_error(self, var, loginfo, fullvar=None):
|
||||||
info = ""
|
info = ""
|
||||||
if "file" in loginfo:
|
if "file" in loginfo:
|
||||||
info = " file: %s" % loginfo["file"]
|
info = " file: %s" % loginfo["file"]
|
||||||
if "line" in loginfo:
|
if "line" in loginfo:
|
||||||
info += " line: %s" % loginfo["line"]
|
info += " line: %s" % loginfo["line"]
|
||||||
|
if fullvar and fullvar != var:
|
||||||
|
info += " referenced as: %s" % fullvar
|
||||||
if info:
|
if info:
|
||||||
info = " (%s)" % info.strip()
|
info = " (%s)" % info.strip()
|
||||||
bb.erroronce('Variable %s has been renamed to %s%s' % (var, self._var_renames[var], info))
|
bb.erroronce('Variable %s has been renamed to %s%s' % (var, self._var_renames[var], info))
|
||||||
@@ -536,7 +538,7 @@ class DataSmart(MutableMapping):
|
|||||||
|
|
||||||
shortvar = var.split(":", 1)[0]
|
shortvar = var.split(":", 1)[0]
|
||||||
if shortvar in self._var_renames:
|
if shortvar in self._var_renames:
|
||||||
self._print_rename_error(shortvar, loginfo)
|
self._print_rename_error(shortvar, loginfo, fullvar=var)
|
||||||
|
|
||||||
self.expand_cache = {}
|
self.expand_cache = {}
|
||||||
parsing=False
|
parsing=False
|
||||||
|
|||||||
Reference in New Issue
Block a user