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:47:19 +0100 |
commit | 4c38798cae14182433f2729d957e370fa3d56c51 (patch) | |
tree | ec3680850d65b15952a67261fb062dba5d437c8a | |
parent | 93698ac54a0e4a94210b21df32e27a5252bf1056 (diff) | |
download | poky-4c38798cae14182433f2729d957e370fa3d56c51.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
(From OE-Core rev: a7a783c30cc58008f0e070dad39d40038e0a5eb5)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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): | |||
97 | if not param: | 97 | if not param: |
98 | continue | 98 | continue |
99 | try: | 99 | try: |
100 | uaargs = parser.parse_args(re.split('''[ \t]*(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param)) | 100 | uaargs = parser.parse_args(re.split('''[ \t]+(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param)) |
101 | except: | 101 | except: |
102 | raise bb.build.FuncFailed("%s: Unable to parse arguments for USERADD_PARAM_%s: '%s'" % (d.getVar('PN', True), pkg, param)) | 102 | raise bb.build.FuncFailed("%s: Unable to parse arguments for USERADD_PARAM_%s: '%s'" % (d.getVar('PN', True), pkg, param)) |
103 | 103 | ||
@@ -231,7 +231,7 @@ def update_useradd_static_config(d): | |||
231 | continue | 231 | continue |
232 | try: | 232 | try: |
233 | # If we're processing multiple lines, we could have left over values here... | 233 | # If we're processing multiple lines, we could have left over values here... |
234 | gaargs = parser.parse_args(re.split('''[ \t]*(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param)) | 234 | gaargs = parser.parse_args(re.split('''[ \t]+(?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', param)) |
235 | except: | 235 | except: |
236 | raise bb.build.FuncFailed("%s: Unable to parse arguments for GROUPADD_PARAM_%s: '%s'" % (d.getVar('PN', True), pkg, param)) | 236 | raise bb.build.FuncFailed("%s: Unable to parse arguments for GROUPADD_PARAM_%s: '%s'" % (d.getVar('PN', True), pkg, param)) |
237 | 237 | ||