sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: 7fd08497cf780018fa144a870bdea0e7a69dae20)

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Patrick Ohly 2016-03-17 17:00:55 +01:00 committed by Richard Purdie
parent 7d6801c465
commit 805aca8192
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta/classes/sanity.bbclass
View File

@ -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)