summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Ylinen <mikko.ylinen@intel.com>2016-10-21 10:05:45 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-28 11:27:33 +0100
commit55384cfc743a12a78bef736ee08ed453b6a6a21e (patch)
tree9f6801c3eedb4c403612aee1b8671239e2a37f71
parent581a746f081a265e08b41712e7bc953f46c6e92a (diff)
downloadopenembedded-core-contrib-55384cfc743a12a78bef736ee08ed453b6a6a21e.tar.gz
openembedded-core-contrib-55384cfc743a12a78bef736ee08ed453b6a6a21e.tar.bz2
openembedded-core-contrib-55384cfc743a12a78bef736ee08ed453b6a6a21e.zip
useradd-staticids.bbclass: catch missing uid/gid exceptions
The change to get rid of FuncFailed exceptions changed the behavior of how missing uid/gid error are be handled. Instead of catching the exception and handling that via bb.parse.SkipPackage(), a fatal error was called. This won't work with recipes that are unused and therefore do not have UID/GIDs defined. The problem triggers when parsing all recipes (e.g., oe-selftest runs bitbake -p). The right way to handle this is to raise bb.parse.SkipPackage(). This will error correctly once the recipe is needed. Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/useradd-staticids.bbclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index afb580aedc..4162774e9c 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -53,8 +53,7 @@ def update_useradd_static_config(d):
def handle_missing_id(id, type, pkg):
# For backwards compatibility we accept "1" in addition to "error"
if d.getVar('USERADD_ERROR_DYNAMIC', True) == 'error' or d.getVar('USERADD_ERROR_DYNAMIC', True) == '1':
- #bb.error("Skipping recipe %s, package %s which adds %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id))
- bb.fatal("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id))
+ raise NotImplementedError("%s - %s: %sname %s does not have a static ID defined. Skipping it." % (d.getVar('PN', True), pkg, type, id))
elif d.getVar('USERADD_ERROR_DYNAMIC', True) == 'warn':
bb.warn("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id))
@@ -323,7 +322,7 @@ python __anonymous() {
and not bb.data.inherits_class('native', d):
try:
update_useradd_static_config(d)
- except bb.build.FuncFailed as f:
+ except NotImplementedError as f:
bb.debug(1, "Skipping recipe %s: %s" % (d.getVar('PN', True), f))
raise bb.parse.SkipPackage(f)
}