From 5d71ab4210bae688e26705c8d2cba591f0530d76 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Fri, 12 Jun 2020 14:36:40 +0100 Subject: 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 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 Signed-off-by: Richard Purdie (cherry picked from commit 4c1e74bdf4922519d168434afd69c9bebcb9bd82) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- scripts/lib/recipetool/edit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') 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): recipe_path = tinfoil.get_recipe_file(args.target) appends = tinfoil.get_file_appends(recipe_path) - return scriptutils.run_editor([recipe_path] + appends, logger) + return scriptutils.run_editor([recipe_path] + list(appends), logger) def register_commands(subparsers): -- cgit v1.2.3-54-g00ecf