From 09839f6a8a7be68d133170ce9b2decf2fa99144b Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 16 Feb 2024 19:59:51 +0100 Subject: devtool: _extract_source: Correct the removal of an old backup directory Also correct the comment describing what is happening. (From OE-Core rev: 7d867753fba8d536bef4c72c7bea3f4ed26a1a95) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index dd9232da1c..ccb7ea851b 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -667,13 +667,13 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works if sync: bb.process.run('git fetch file://' + srcsubdir + ' ' + devbranch + ':' + devbranch, cwd=srctree) - # Move oe-local-files directory to srctree - # As the oe-local-files is not part of the constructed git tree, - # remove them directly during the synchrounizating might surprise - # the users. Instead, we move it to oe-local-files.bak and remind - # user in the log message. + # Move the oe-local-files directory to srctree. + # As oe-local-files is not part of the constructed git tree, + # removing it directly during the synchronization might surprise + # the user. Instead, we move it to oe-local-files.bak and remind + # the user in the log message. if os.path.exists(srctree_localdir + '.bak'): - shutil.rmtree(srctree_localdir, srctree_localdir + '.bak') + shutil.rmtree(srctree_localdir + '.bak') if os.path.exists(srctree_localdir): logger.info('Backing up current local file directory %s' % srctree_localdir) -- cgit v1.2.3-54-g00ecf