summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-05 11:11:44 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-11 17:21:44 +0000
commit1dcc0ab902ff8140d5b5eb05451087976bb5f2a3 (patch)
treec04c8d6d8830030a5dad6fe894e90409e5de09ae
parente8b00a62b160e2d118c0a94a53e72198b79eedf3 (diff)
downloadpoky-1dcc0ab902ff8140d5b5eb05451087976bb5f2a3.tar.gz
recipetool: fix encoding-related errors creating python recipes
Yet another instance of us expecting a string back from subprocess when in Python 3 what you get back is bytes. Just decode the output within run_command() so we avoid this everywhere. (From OE-Core rev: 103faae78cdff5280c7b7cdb7ca01e0868d02ec9) (From OE-Core rev: f9e0267a64069fa2488ceb7ca1f6dbe5bfb66c18) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/recipetool/create_buildsys_python.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/recipetool/create_buildsys_python.py b/scripts/lib/recipetool/create_buildsys_python.py
index e41d81a317..82a2be1224 100644
--- a/scripts/lib/recipetool/create_buildsys_python.py
+++ b/scripts/lib/recipetool/create_buildsys_python.py
@@ -512,7 +512,7 @@ class PythonRecipeHandler(RecipeHandler):
512 except (OSError, subprocess.CalledProcessError): 512 except (OSError, subprocess.CalledProcessError):
513 pass 513 pass
514 else: 514 else:
515 for line in dep_output.decode('utf-8').splitlines(): 515 for line in dep_output.splitlines():
516 line = line.rstrip() 516 line = line.rstrip()
517 dep, filename = line.split('\t', 1) 517 dep, filename = line.split('\t', 1)
518 if filename.endswith('/setup.py'): 518 if filename.endswith('/setup.py'):
@@ -591,7 +591,7 @@ class PythonRecipeHandler(RecipeHandler):
591 if 'stderr' not in popenargs: 591 if 'stderr' not in popenargs:
592 popenargs['stderr'] = subprocess.STDOUT 592 popenargs['stderr'] = subprocess.STDOUT
593 try: 593 try:
594 return subprocess.check_output(cmd, **popenargs) 594 return subprocess.check_output(cmd, **popenargs).decode('utf-8')
595 except OSError as exc: 595 except OSError as exc:
596 logger.error('Unable to run `{}`: {}', ' '.join(cmd), exc) 596 logger.error('Unable to run `{}`: {}', ' '.join(cmd), exc)
597 raise 597 raise