public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Peter Kjellerstedt <pkj@axis.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [PATCH 2/7] devtool: _extract_source: Correct the removal of an old backup directory
Date: Fri, 16 Feb 2024 19:59:51 +0100	[thread overview]
Message-ID: <20240216185956.2606978-2-pkj@axis.com> (raw)
In-Reply-To: <20240216185956.2606978-1-pkj@axis.com>

Also correct the comment describing what is happening.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 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)


  reply	other threads:[~2024-02-16 19:00 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-16 18:59 [PATCH 1/7] devtool: standard: Add some missing whitespace Peter Kjellerstedt
2024-02-16 18:59 ` Peter Kjellerstedt [this message]
2024-02-16 18:59 ` [PATCH 3/7] lib/oe/patch: Make extractPatches() not extract ignored commits Peter Kjellerstedt
2024-02-17  8:52   ` [OE-core] " Richard Purdie
2024-02-16 18:59 ` [PATCH 4/7] lib/oe/patch: Add GitApplyTree.commitIgnored() Peter Kjellerstedt
2024-02-16 18:59 ` [PATCH 5/7] devtool: Make use of oe.patch.GitApplyTree.commitIgnored() Peter Kjellerstedt
2024-02-16 18:59 ` [PATCH 6/7] patch.bbclass: " Peter Kjellerstedt
2024-02-16 19:30   ` Patchtest results for " patchtest
2024-02-16 18:59 ` [PATCH 7/7] lib/oe/patch: Use git notes to store the filenames for the patches Peter Kjellerstedt
2024-02-17 12:34   ` [OE-core] " Richard Purdie
2024-02-18 22:10     ` Peter Kjellerstedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240216185956.2606978-2-pkj@axis.com \
    --to=pkj@axis.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox