diff options
author | Ionut Radu <ionutx.radu@intel.com> | 2013-07-23 18:07:48 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-29 13:09:01 +0100 |
commit | 3e3ab8e02da7f56a87759acbb3e51ccb76448854 (patch) | |
tree | 6a5bbb6b2d4c5b5fbb30ce833ef565fb898b67b6 /meta/classes/useradd.bbclass | |
parent | ee9bdf90ce68f206039720fa30d2b97b577c8057 (diff) | |
download | poky-3e3ab8e02da7f56a87759acbb3e51ccb76448854.tar.gz |
useradd.bbclass: fix traceback when inheriting useradd but not setting USERADD_PARAM or GROUPADD_PARAM
Replaced bb.build.FuncFailed with bb.fatal
[YOCTO #4486]
(From OE-Core rev: be6d0f398404e4566d4fac145c745899909117f1)
Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/useradd.bbclass')
-rw-r--r-- | meta/classes/useradd.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 9b3ac258ae..21daae8d77 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -133,7 +133,7 @@ def update_useradd_after_parse(d): | |||
133 | 133 | ||
134 | for pkg in useradd_packages.split(): | 134 | for pkg in useradd_packages.split(): |
135 | if not d.getVar('USERADD_PARAM_%s' % pkg, True) and not d.getVar('GROUPADD_PARAM_%s' % pkg, True) and not d.getVar('GROUPMEMS_PARAM_%s' % pkg, True): | 135 | if not d.getVar('USERADD_PARAM_%s' % pkg, True) and not d.getVar('GROUPADD_PARAM_%s' % pkg, True) and not d.getVar('GROUPMEMS_PARAM_%s' % pkg, True): |
136 | raise bb.build.FuncFailed("%s inherits useradd but doesn't set USERADD_PARAM, GROUPADD_PARAM or GROUPMEMS_PARAM for package %s" % (d.getVar('FILE'), pkg)) | 136 | bb.fatal("%s inherits useradd but doesn't set USERADD_PARAM, GROUPADD_PARAM or GROUPMEMS_PARAM for package %s" % (d.getVar('FILE'), pkg)) |
137 | 137 | ||
138 | python __anonymous() { | 138 | python __anonymous() { |
139 | update_useradd_after_parse(d) | 139 | update_useradd_after_parse(d) |