diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2016-06-10 17:46:11 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-12 23:46:51 +0100 |
| commit | a7a783c30cc58008f0e070dad39d40038e0a5eb5 (patch) | |
| tree | f7c88a1f29f72e151d472384094fc37aacb6ad2f | |
| parent | 77adf8341694b76cf58b7a31dda18b85b3eb87a2 (diff) | |
| download | openembedded-core-contrib-a7a783c30cc58008f0e070dad39d40038e0a5eb5.tar.gz | |
useradd-staticids.bbclass: Avoid FutureWarning about split()
This avoids the following warning with Python 3.5:
/usr/lib64/python3.5/re.py:203: FutureWarning: split() requires a
non-empty pattern
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/useradd-staticids.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index 440c0e3846..d963f283b7 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass @@ -97,7 +97,7 @@ def update_useradd_static_config(d): if not param: continue try: - uaargs = parser.parse_args(re.split('''[ \t]*(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param)) + uaargs = parser.parse_args(re.split('''[ \t]+(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param)) except: raise bb.build.FuncFailed("%s: Unable to parse arguments for USERADD_PARAM_%s: '%s'" % (d.getVar('PN', True), pkg, param)) @@ -231,7 +231,7 @@ def update_useradd_static_config(d): continue try: # If we're processing multiple lines, we could have left over values here... - gaargs = parser.parse_args(re.split('''[ \t]*(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param)) + gaargs = parser.parse_args(re.split('''[ \t]+(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param)) except: raise bb.build.FuncFailed("%s: Unable to parse arguments for GROUPADD_PARAM_%s: '%s'" % (d.getVar('PN', True), pkg, param)) |