mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-04 20:54:45 +02:00
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 <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
33216d08f7
commit
09839f6a8a
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue
Block a user