diff options
author | Ulf Magnusson <ulfalizer@gmail.com> | 2016-10-01 04:47:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-04 16:29:04 +0100 |
commit | db6ae5254408a1a8266d56b95fb02235794e46ce (patch) | |
tree | 98af07334705417d5ffc37102f0f341311afc014 /meta/classes/useradd.bbclass | |
parent | fadc4fc746c09228c5b52b0e484664e73d9fb87e (diff) | |
download | poky-db6ae5254408a1a8266d56b95fb02235794e46ce.tar.gz |
useradd.bbclass: Use bb.fatal() instead of raising FuncFailed
This sets a good example and avoids unnecessarily contributing to
perceived complexity and cargo culting.
Motivating quote below:
< kergoth> the *original* intent was for the function/task to error via
whatever appropriate means, bb.fatal, whatever, and
funcfailed was what you'd catch if you were calling
exec_func/exec_task. that is, it's what those functions
raise, not what metadata functions should be raising
< kergoth> it didn't end up being used that way
< kergoth> but there's really never a reason to raise it yourself
FuncFailed.__init__ takes a 'name' argument rather than a 'msg'
argument, which also shows that the original purpose got lost.
(From OE-Core rev: 21969c3d1397e0a11a8cb9dad8ce3469ee655f57)
Signed-off-by: Ulf Magnusson <ulfalizer@gmail.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 bf62ada8b5..3cff08e00d 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -171,7 +171,7 @@ def update_useradd_after_parse(d): | |||
171 | useradd_packages = d.getVar('USERADD_PACKAGES', True) | 171 | useradd_packages = d.getVar('USERADD_PACKAGES', True) |
172 | 172 | ||
173 | if not useradd_packages: | 173 | if not useradd_packages: |
174 | raise bb.build.FuncFailed("%s inherits useradd but doesn't set USERADD_PACKAGES" % d.getVar('FILE', False)) | 174 | bb.fatal("%s inherits useradd but doesn't set USERADD_PACKAGES" % d.getVar('FILE', False)) |
175 | 175 | ||
176 | for pkg in useradd_packages.split(): | 176 | for pkg in useradd_packages.split(): |
177 | 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): | 177 | 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): |