]> code.ossystems Code Review - openembedded-core.git/commitdiff
recipetool: Fix list concatenation when using edit
authorAlex Kiernan <alex.kiernan@gmail.com>
Fri, 12 Jun 2020 13:36:40 +0000 (14:36 +0100)
committerSteve Sakoman <steve@sakoman.com>
Thu, 18 Jun 2020 16:23:00 +0000 (06:23 -1000)
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

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>
scripts/lib/recipetool/edit.py

index 94bdf7bca4eb2484a361631ed5119a2330c73347..d5b980a1c03ed3f49dec3ac504d45cae2b2c3d69 100644 (file)
@@ -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):