summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/utils.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-14 15:49:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-16 15:35:07 (GMT)
commitcd4b8a8553f9d551af27941910cf4d3405ecb7b0 (patch)
tree4f2c58eca95fd5ea9a4538a66a4875fd9d947b0d /meta/lib/oe/utils.py
parent1ee53881eea3a7ca4d4f6a5ca9c4c6e6488d2348 (diff)
downloadpoky-cd4b8a8553f9d551af27941910cf4d3405ecb7b0.tar.gz
meta: Fix Deprecated warnings from regexs
Fix handling of escape characters in regexs and hence fix python Deprecation warnings which will be problematic in python 3.8. Note that some show up as: """ meta/classes/package.bbclass:1293: DeprecationWarning: invalid escape sequence \.   """ where the problem isn't on 1293 in package.bbclass but in some _prepend to a package.bbclass function in a different file like mesa.inc, often from do_package_split() calls. (From OE-Core rev: 4b1c0c7d5525fc4cea9e0f02ec54e92a6fbc6199) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/utils.py')
-rw-r--r--meta/lib/oe/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index ee6f0e6..7b574ff 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -326,7 +326,7 @@ def multiprocess_launch(target, items, d, extraargs=None):
326 326
327def squashspaces(string): 327def squashspaces(string):
328 import re 328 import re
329 return re.sub("\s+", " ", string).strip() 329 return re.sub(r"\s+", " ", string).strip()
330 330
331def format_pkg_list(pkg_dict, ret_format=None): 331def format_pkg_list(pkg_dict, ret_format=None):
332 output = [] 332 output = []
@@ -374,7 +374,7 @@ def host_gcc_version(d, taskcontextonly=False):
374 except subprocess.CalledProcessError as e: 374 except subprocess.CalledProcessError as e:
375 bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8"))) 375 bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8")))
376 376
377 match = re.match(".* (\d\.\d)\.\d.*", output.split('\n')[0]) 377 match = re.match(r".* (\d\.\d)\.\d.*", output.split('\n')[0])
378 if not match: 378 if not match:
379 bb.fatal("Can't get compiler version from %s --version output" % compiler) 379 bb.fatal("Can't get compiler version from %s --version output" % compiler)
380 380