From: Fabrice Coulon Date: Tue, 2 Sep 2014 09:11:16 +0000 (+0200) Subject: useradd-staticids.bbclass: Fix for Bug 6633 X-Git-Tag: 2015-4~1620 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f249ef32709069a2680b92dc5a5b4f6545d014b7;p=openembedded-core.git useradd-staticids.bbclass: Fix for Bug 6633 When using the useradd-staticids.bbclass under meta/classes, this error occurs: " - : Username does not have a static uid defined." There was a problem with the regular expression for parsing parameters, it was sometimes returning an empty string. I have fixed this by skipping empty strings. Signed-off-by: Fabrice Coulon Signed-off-by: Richard Purdie --- diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index a89cb10a4a..421a70a6ab 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass @@ -58,7 +58,9 @@ def update_useradd_static_config(d): newparams = [] for param in re.split('''[ \t]*;[ \t]*(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', params): - param=param.strip() + param = param.strip() + if not param: + continue try: uaargs = parser.parse_args(re.split('''[ \t]*(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param)) except: @@ -194,7 +196,9 @@ def update_useradd_static_config(d): newparams = [] for param in re.split('''[ \t]*;[ \t]*(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', params): - param=param.strip() + param = param.strip() + if not param: + continue try: # If we're processing multiple lines, we could have left over values here... gaargs = parser.parse_args(re.split('''[ \t]*(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param))