MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

devtool: _extract_source: Correct the removal of an old backup directory

Browse Source 
Also correct the comment describing what is happening.

(From OE-Core rev: 7d867753fba8d536bef4c72c7bea3f4ed26a1a95)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt 2024-02-16 19:59:51 +01:00 committed by Richard Purdie
parent 33216d08f7
commit 09839f6a8a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/lib/devtool/standard.py
View File

@ -667,13 +667,13 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works
if sync: if sync:
bb.process.run('git fetch file://' + srcsubdir + ' ' + devbranch + ':' + devbranch, cwd=srctree) bb.process.run('git fetch file://' + srcsubdir + ' ' + devbranch + ':' + devbranch, cwd=srctree)
# Move oe-local-files directory to srctree # Move the oe-local-files directory to srctree.
# As the oe-local-files is not part of the constructed git tree, # As oe-local-files is not part of the constructed git tree,
# remove them directly during the synchrounizating might surprise # removing it directly during the synchronization might surprise
# the users. Instead, we move it to oe-local-files.bak and remind # the user. Instead, we move it to oe-local-files.bak and remind
# user in the log message. # the user in the log message.
if os.path.exists(srctree_localdir + '.bak'): 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): if os.path.exists(srctree_localdir):
logger.info('Backing up current local file directory %s' % srctree_localdir) logger.info('Backing up current local file directory %s' % srctree_localdir)