bitbake: data_smart: Allow rename mechanism to show full expressions

(Bitbake rev: bac6f7acfd2e6b5b4d6d3a8d40beeff76b215751)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 43d59de550..68bdc3430f 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -513,12 +513,14 @@ class DataSmart(MutableMapping):
     def hasOverrides(self, var):
         return var in self.overridedata
 
-    def _print_rename_error(self, var, loginfo):
+    def _print_rename_error(self, var, loginfo, fullvar=None):
         info = ""
         if "file" in loginfo:
             info = " file: %s" % loginfo["file"]
         if "line" in loginfo:
             info += " line: %s" % loginfo["line"]
+        if fullvar and fullvar != var:
+            info += " referenced as: %s" % fullvar
         if info:
             info = " (%s)" % info.strip()
         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]
         if shortvar in self._var_renames:
-            self._print_rename_error(shortvar, loginfo)
+            self._print_rename_error(shortvar, loginfo, fullvar=var)
 
         self.expand_cache = {}
         parsing=False