[oe-commits] [openembedded-core] 12/32: oe/path.py: copyhardlinktree: don't overwrite existing symlinks

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit c1b73fe26540c38086e259be6eb313e0826dceed
Author: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
AuthorDate: Mon Aug 21 20:09:35 2017 +0300

    oe/path.py: copyhardlinktree: don't overwrite existing symlinks
    
    Before GNU tar 1.24, only the archive creation command had the '-h'
    argument to preserve and follow symlinks. After >= 1.24 via commit
    14efeb9f956e38d7be (tar: --dereference consistency) the capability to
    preserve symlinks was also added to the archive extraction command.
    
    -h is default at archive creation but is not default at extraction,
    meaning that it will replace symlinks with directories even if the
    original filesystem directory tree and archive contains them.
    
    Add -h to the copyhardlinktree extraction step so the build can
    support symlinks in variables like ${DEPLOY_DIR_IPK/RPM/DEB}.
    
    Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/path.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index 448a2b9..1ea03d5 100644
--- a/meta/lib/oe/path.py
+++ b/meta/lib/oe/path.py
@@ -98,7 +98,7 @@ def copyhardlinktree(src, dst):
     if (os.stat(src).st_dev ==  os.stat(dst).st_dev):
         # Need to copy directories only with tar first since cp will error if two 
         # writers try and create a directory at the same time
-        cmd = "cd %s; find . -type d -print | tar --xattrs --xattrs-include='*' -cf - -C %s -p --no-recursion --files-from - | tar --xattrs --xattrs-include='*' -xf - -C %s" % (src, src, dst)
+        cmd = "cd %s; find . -type d -print | tar --xattrs --xattrs-include='*' -cf - -C %s -p --no-recursion --files-from - | tar --xattrs --xattrs-include='*' -xhf - -C %s" % (src, src, dst)
         subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
         source = ''
         if os.path.isdir(src):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.