]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
devtool: Fix _copy_file() TypeError
authorXiaobing Luo <luoxiaobing0926@gmail.com>
Thu, 9 Jun 2022 11:47:03 +0000 (11:47 +0000)
committerSteve Sakoman <steve@sakoman.com>
Sat, 4 Feb 2023 14:35:28 +0000 (04:35 -1000)
when devtool finish, the _copy_file() failed.
--------------------------------------------
TypeError: _copy_file() got an unexpected keyword argument
'base_outdir'
--------------------------------------------

Fixes: 05f2d5d2ce00 ("devtool: finish: add dry-run option")
Signed-off-by: Xiaobing Luo <luoxiaobing0926@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a45d9dc089fb2719ca69b92870917f8c0925f632)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
scripts/lib/devtool/standard.py

index f364a452834e9f0edacff79b1e543b8fdc9f1464..cfa88616af1ae92ef878d22749cfb052e03b8da3 100644 (file)
@@ -357,7 +357,7 @@ def _move_file(src, dst, dry_run_outdir=None, base_outdir=None):
             bb.utils.mkdirhier(dst_d)
         shutil.move(src, dst)
 
-def _copy_file(src, dst, dry_run_outdir=None):
+def _copy_file(src, dst, dry_run_outdir=None, base_outdir=None):
     """Copy a file. Creates all the directory components of destination path."""
     dry_run_suffix = ' (dry-run)' if dry_run_outdir else ''
     logger.debug('Copying %s to %s%s' % (src, dst, dry_run_suffix))