]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
devtool: _extract_source: Correct the removal of an old backup directory
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Fri, 16 Feb 2024 18:59:51 +0000 (19:59 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 18 Feb 2024 22:02:23 +0000 (22:02 +0000)
Also correct the comment describing what is happening.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/lib/devtool/standard.py

index dd9232da1cc4321c3df4c4c60294343c05d77f50..ccb7ea851ba682d1e21bbcb3f591d9d8d17dc999 100644 (file)
@@ -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)