diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2024-02-16 19:59:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-18 22:02:40 +0000 |
commit | 09839f6a8a7be68d133170ce9b2decf2fa99144b (patch) | |
tree | f83e9a6534e9b9bb261947d15047382261713fb3 /scripts | |
parent | 33216d08f742b01420a4b1478542a571e12e6fbb (diff) | |
download | poky-09839f6a8a7be68d133170ce9b2decf2fa99144b.tar.gz |
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>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/devtool/standard.py | 12 |
1 files 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 | |||
667 | if sync: | 667 | if sync: |
668 | bb.process.run('git fetch file://' + srcsubdir + ' ' + devbranch + ':' + devbranch, cwd=srctree) | 668 | bb.process.run('git fetch file://' + srcsubdir + ' ' + devbranch + ':' + devbranch, cwd=srctree) |
669 | 669 | ||
670 | # Move oe-local-files directory to srctree | 670 | # Move the oe-local-files directory to srctree. |
671 | # As the oe-local-files is not part of the constructed git tree, | 671 | # As oe-local-files is not part of the constructed git tree, |
672 | # remove them directly during the synchrounizating might surprise | 672 | # removing it directly during the synchronization might surprise |
673 | # the users. Instead, we move it to oe-local-files.bak and remind | 673 | # the user. Instead, we move it to oe-local-files.bak and remind |
674 | # user in the log message. | 674 | # the user in the log message. |
675 | if os.path.exists(srctree_localdir + '.bak'): | 675 | if os.path.exists(srctree_localdir + '.bak'): |
676 | shutil.rmtree(srctree_localdir, srctree_localdir + '.bak') | 676 | shutil.rmtree(srctree_localdir + '.bak') |
677 | 677 | ||
678 | if os.path.exists(srctree_localdir): | 678 | if os.path.exists(srctree_localdir): |
679 | logger.info('Backing up current local file directory %s' % srctree_localdir) | 679 | logger.info('Backing up current local file directory %s' % srctree_localdir) |