sanity.bbclass: expand error messages for version checks

The ${WORKDIR} variable was not getting expanded (anymore?), leading to
less helpful error messages like:

   Exception: NotImplementedError: Your version of bblayers.conf has the wrong LCONF_VERSION (has 7, expecting 8).
   Please compare your file against bblayers.conf.sample and merge any changes before continuing.
   "meld conf/bblayers.conf ${COREBASE}/meta*/conf/bblayers.conf.sample"

   is a good way to visualise the changes.

   ERROR: Execution of event handler 'check_sanity_eventhandler' failed

After adding expansion, embedding ${LCONF_VERSION} and ${LAYER_CONF_VERSION}
in the error message seems a bit more readable and consistent.

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 4873e64a79fdd851774c49f28b6691befcca823c..334e3626323cdb4d15547c8f8ba4087ba5225d12 100644 (file)
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -48,6 +48,7 @@ Matching the version numbers will remove this message.
 \"meld conf/local.conf ${COREBASE}/meta*/conf/local.conf.sample\" 
 
 is a good way to visualise the changes."
+    failmsg = d.expand(failmsg)
 
     raise NotImplementedError(failmsg)
 }
@@ -66,6 +67,7 @@ Matching the version numbers will remove this message.
 \"meld conf/site.conf ${COREBASE}/meta*/conf/site.conf.sample\" 
 
 is a good way to visualise the changes."
+    failmsg = d.expand(failmsg)
 
     raise NotImplementedError(failmsg)
 }
@@ -76,11 +78,12 @@ python oecore_update_bblayers() {
     current_lconf = int(d.getVar('LCONF_VERSION', True))
     lconf_version = int(d.getVar('LAYER_CONF_VERSION', True))
 
-    failmsg = """Your version of bblayers.conf has the wrong LCONF_VERSION (has %s, expecting %s).
+    failmsg = """Your version of bblayers.conf has the wrong LCONF_VERSION (has ${LCONF_VERSION}, expecting ${LAYER_CONF_VERSION}).
 Please compare your file against bblayers.conf.sample and merge any changes before continuing.
 "meld conf/bblayers.conf ${COREBASE}/meta*/conf/bblayers.conf.sample" 
 
-is a good way to visualise the changes.""" % (current_lconf, lconf_version)
+is a good way to visualise the changes."""
+    failmsg = d.expand(failmsg)
 
     if not current_lconf:
         raise NotImplementedError(failmsg)