summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Coulon <fabrice@axis.com>2014-09-02 11:11:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-03 11:26:15 +0100
commitf249ef32709069a2680b92dc5a5b4f6545d014b7 (patch)
tree6624c43b9c0d18122de51eaa09a3b5d1a3cdd8a7
parent0e33d232916125ba5305ced7200cc00f8b5f7b22 (diff)
downloadopenembedded-core-contrib-f249ef32709069a2680b92dc5a5b4f6545d014b7.tar.gz
openembedded-core-contrib-f249ef32709069a2680b92dc5a5b4f6545d014b7.tar.bz2
openembedded-core-contrib-f249ef32709069a2680b92dc5a5b4f6545d014b7.zip
useradd-staticids.bbclass: Fix for Bug 6633
When using the useradd-staticids.bbclass under meta/classes, this error occurs: "<username> - <username>: 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 <fabrice@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/useradd-staticids.bbclass8
1 files changed, 6 insertions, 2 deletions
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))