summaryrefslogtreecommitdiffstats
path: root/meta/classes/useradd-staticids.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/useradd-staticids.bbclass')
-rw-r--r--meta/classes/useradd-staticids.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index 46d4a4b3da..afb580aedc 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -16,7 +16,7 @@ def update_useradd_static_config(d):
16 error(message) 16 error(message)
17 17
18 def error(self, message): 18 def error(self, message):
19 raise bb.build.FuncFailed(message) 19 bb.fatal(message)
20 20
21 def list_extend(iterable, length, obj = None): 21 def list_extend(iterable, length, obj = None):
22 """Ensure that iterable is the specified length by extending with obj 22 """Ensure that iterable is the specified length by extending with obj
@@ -54,7 +54,7 @@ def update_useradd_static_config(d):
54 # For backwards compatibility we accept "1" in addition to "error" 54 # For backwards compatibility we accept "1" in addition to "error"
55 if d.getVar('USERADD_ERROR_DYNAMIC', True) == 'error' or d.getVar('USERADD_ERROR_DYNAMIC', True) == '1': 55 if d.getVar('USERADD_ERROR_DYNAMIC', True) == 'error' or d.getVar('USERADD_ERROR_DYNAMIC', True) == '1':
56 #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)) 56 #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))
57 raise bb.build.FuncFailed("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id)) 57 bb.fatal("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id))
58 elif d.getVar('USERADD_ERROR_DYNAMIC', True) == 'warn': 58 elif d.getVar('USERADD_ERROR_DYNAMIC', True) == 'warn':
59 bb.warn("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id)) 59 bb.warn("%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN', True), pkg, type, id))
60 60
@@ -107,7 +107,7 @@ def update_useradd_static_config(d):
107 try: 107 try:
108 uaargs = parser.parse_args(re.split('''[ \t]+(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param)) 108 uaargs = parser.parse_args(re.split('''[ \t]+(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param))
109 except: 109 except:
110 raise bb.build.FuncFailed("%s: Unable to parse arguments for USERADD_PARAM_%s: '%s'" % (d.getVar('PN', True), pkg, param)) 110 bb.fatal("%s: Unable to parse arguments for USERADD_PARAM_%s: '%s'" % (d.getVar('PN', True), pkg, param))
111 111
112 # Read all passwd files specified in USERADD_UID_TABLES or files/passwd 112 # Read all passwd files specified in USERADD_UID_TABLES or files/passwd
113 # Use the standard passwd layout: 113 # Use the standard passwd layout:
@@ -242,7 +242,7 @@ def update_useradd_static_config(d):
242 # If we're processing multiple lines, we could have left over values here... 242 # If we're processing multiple lines, we could have left over values here...
243 gaargs = parser.parse_args(re.split('''[ \t]+(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param)) 243 gaargs = parser.parse_args(re.split('''[ \t]+(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param))
244 except: 244 except:
245 raise bb.build.FuncFailed("%s: Unable to parse arguments for GROUPADD_PARAM_%s: '%s'" % (d.getVar('PN', True), pkg, param)) 245 bb.fatal("%s: Unable to parse arguments for GROUPADD_PARAM_%s: '%s'" % (d.getVar('PN', True), pkg, param))
246 246
247 # Read all group files specified in USERADD_GID_TABLES or files/group 247 # Read all group files specified in USERADD_GID_TABLES or files/group
248 # Use the standard group layout: 248 # Use the standard group layout: