summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-06-12 14:36:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-26 18:26:48 +0100
commit5d71ab4210bae688e26705c8d2cba591f0530d76 (patch)
tree749a041a26f5c5709b7785e4430a2af2b29ac824 /scripts
parentc9a3c7dd658990512016101f2352f259cdc33d26 (diff)
downloadpoky-5d71ab4210bae688e26705c8d2cba591f0530d76.tar.gz
recipetool: Fix list concatenation when using edit
If there are multiple appends, ensure we concatenate compatible things: Traceback (most recent call last): File "/home/akiernan/poky/scripts/recipetool", line 111, in <module> ret = main() File "/home/akiernan/poky/scripts/recipetool", line 100, in main ret = args.func(args) File "/home/akiernan/poky/scripts/lib/recipetool/edit.py", line 38, in edit return scriptutils.run_editor([recipe_path] + appends, logger) TypeError: can only concatenate list (not "tuple") to list (From OE-Core rev: 9a45c7fb2d4491d2d34500acef8ea6dcd4f5d9d4) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 4c1e74bdf4922519d168434afd69c9bebcb9bd82) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/recipetool/edit.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/edit.py b/scripts/lib/recipetool/edit.py
index 94bdf7bca4..d5b980a1c0 100644
--- a/scripts/lib/recipetool/edit.py
+++ b/scripts/lib/recipetool/edit.py
@@ -34,7 +34,7 @@ def edit(args):
34 recipe_path = tinfoil.get_recipe_file(args.target) 34 recipe_path = tinfoil.get_recipe_file(args.target)
35 appends = tinfoil.get_file_appends(recipe_path) 35 appends = tinfoil.get_file_appends(recipe_path)
36 36
37 return scriptutils.run_editor([recipe_path] + appends, logger) 37 return scriptutils.run_editor([recipe_path] + list(appends), logger)
38 38
39 39
40def register_commands(subparsers): 40def register_commands(subparsers):