diff mbox series

[kirkstone,04/15] devtool: Fix _copy_file() TypeError

Message ID 5e6f4d0d3d314897b8ab2f45b3a78b0da9df99ab.1655666951.git.steve@sakoman.com
State Accepted, archived
Commit 5e6f4d0d3d314897b8ab2f45b3a78b0da9df99ab
Headers show
Series [kirkstone,01/15] vim: Upgrade 8.2.5034 -> 8.2.5083 | expand

Commit Message

Steve Sakoman June 19, 2022, 7:30 p.m. UTC 
From: Xiaobing Luo <luoxiaobing0926@gmail.com>

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Frieder Schrempf Jan. 25, 2023, 2:49 p.m. UTC | #1 
Hi Steve,

On 19.06.22 21:30, Steve Sakoman via lists.openembedded.org wrote:
> From: Xiaobing Luo <luoxiaobing0926@gmail.com>
> 
> 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>

Could you also apply this small fix for dunfell?
Cherry-picking 38f2a7717646 [1] should do.

Thanks
Frieder

[1]
https://git.yoctoproject.org/poky/commit?id=38f2a7717646e68953675757fd7b73c66450c979
Steve Sakoman Jan. 25, 2023, 3:47 p.m. UTC | #2 
On Wed, Jan 25, 2023 at 4:49 AM Frieder Schrempf
<frieder.schrempf@kontron.de> wrote:
>
> Hi Steve,
>
> On 19.06.22 21:30, Steve Sakoman via lists.openembedded.org wrote:
> > From: Xiaobing Luo <luoxiaobing0926@gmail.com>
> >
> > 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>
>
> Could you also apply this small fix for dunfell?

Yes, I will add this to my test queue.

Thanks!

Steve
diff mbox series

Patch

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 01fb5ad96f..4b50e3c63b 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -353,7 +353,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))