diff options
| author | Xiaobing Luo <luoxiaobing0926@gmail.com> | 2022-06-09 11:47:03 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-13 07:44:09 +0000 |
| commit | 25ace795108310a71a65f997726549c307969ec2 (patch) | |
| tree | 0f5bbce4188a38e2a4fa1de8323735404421c068 /scripts | |
| parent | 8369253493c2c3af4ef89fc1b28903341426c86f (diff) | |
| download | poky-25ace795108310a71a65f997726549c307969ec2.tar.gz | |
devtool: Fix _copy_file() TypeError
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")
(From OE-Core rev: a434079b7e8e23e9cf0b45f5fb56e8be7b8d885e)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/standard.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index f364a45283..cfa88616af 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
| @@ -357,7 +357,7 @@ def _move_file(src, dst, dry_run_outdir=None, base_outdir=None): | |||
| 357 | bb.utils.mkdirhier(dst_d) | 357 | bb.utils.mkdirhier(dst_d) |
| 358 | shutil.move(src, dst) | 358 | shutil.move(src, dst) |
| 359 | 359 | ||
| 360 | def _copy_file(src, dst, dry_run_outdir=None): | 360 | def _copy_file(src, dst, dry_run_outdir=None, base_outdir=None): |
| 361 | """Copy a file. Creates all the directory components of destination path.""" | 361 | """Copy a file. Creates all the directory components of destination path.""" |
| 362 | dry_run_suffix = ' (dry-run)' if dry_run_outdir else '' | 362 | dry_run_suffix = ' (dry-run)' if dry_run_outdir else '' |
| 363 | logger.debug('Copying %s to %s%s' % (src, dst, dry_run_suffix)) | 363 | logger.debug('Copying %s to %s%s' % (src, dst, dry_run_suffix)) |