diff options
Diffstat (limited to 'meta/classes/useradd-staticids.bbclass')
| -rw-r--r-- | meta/classes/useradd-staticids.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index 50a7481a60..92b290c186 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass | |||
| @@ -47,9 +47,12 @@ def update_useradd_static_config(d): | |||
| 47 | return id_table | 47 | return id_table |
| 48 | 48 | ||
| 49 | def handle_missing_id(id, type, pkg): | 49 | def handle_missing_id(id, type, pkg): |
| 50 | if d.getVar('USERADD_ERROR_DYNAMIC', True) == '1': | 50 | # For backwards compatibility we accept "1" in addition to "error" |
| 51 | if d.getVar('USERADD_ERROR_DYNAMIC', True) == 'error' or d.getVar('USERADD_ERROR_DYNAMIC', True) == '1': | ||
| 51 | #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)) | 52 | #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)) |
| 52 | raise bb.build.FuncFailed("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id)) | 53 | raise bb.build.FuncFailed("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id)) |
| 54 | elif d.getVar('USERADD_ERROR_DYNAMIC', True) == 'warn': | ||
| 55 | bb.warn("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id)) | ||
| 53 | 56 | ||
| 54 | # We parse and rewrite the useradd components | 57 | # We parse and rewrite the useradd components |
| 55 | def rewrite_useradd(params): | 58 | def rewrite_useradd(params): |