diff options
| author |   Fabrice Coulon <fabrice@axis.com> | 2014-09-02 11:11:16 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-23 13:02:14 +0100 |
| commit | 592f0dccaf1985194f40fc019a9d33b9623df37f (patch) | |
| tree | 956fad37e89372e6f3dfd0c54de047ade4d439da | |
| parent | d02cdf3ee88c7bbb93cecf094008858782deec3f (diff) | |
| download | openembedded-core-592f0dccaf1985194f40fc019a9d33b9623df37f.tar.gz | |
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.
(From OE-Core rev: f249ef32709069a2680b92dc5a5b4f6545d014b7)
Signed-off-by: Fabrice Coulon <fabrice@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/useradd-staticids.bbclass | 8 |
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)) |