[oe-commits] [bitbake] 01/02: checksum: In FileChecksumCache don't follow directory symlinks

[git at git.openembedded.org]

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

commit 66dff37ebcd1dd14ebd6933d727df9cf0a641866
Author: Markus Lehtonen <markus.lehtonen at linux.intel.com>
AuthorDate: Tue Mar 29 16:04:19 2016 +0300

    checksum: In FileChecksumCache don't follow directory symlinks
    
    Before this patch, directory symlinks mathcing filename pattern (either
    a file name or a glob pattern) were followed. However, directory
    symlinks deeper in the search chain were omitted by os.walk(). Now
    directory traversal behaves consistently, ignoring syminks on all
    levels.
    
    One reason for choosing not to "walk into" directory symlinks is that
    dir symlinks in externalsrc.bbclass in oe-core are causing problems in
    source tree checksumming.
    
    [YOCTO #8853]
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/checksum.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/bb/checksum.py b/lib/bb/checksum.py
index 7fb46d8..2ec964d 100644
--- a/lib/bb/checksum.py
+++ b/lib/bb/checksum.py
@@ -123,12 +123,14 @@ class FileChecksumCache(MultiProcessCache):
                 # Handle globs
                 for f in glob.glob(pth):
                     if os.path.isdir(f):
-                        checksums.extend(checksum_dir(f))
+                        if not os.path.islink(f):
+                            checksums.extend(checksum_dir(f))
                     else:
                         checksum = checksum_file(f)
                         checksums.append((f, checksum))
             elif os.path.isdir(pth):
-                checksums.extend(checksum_dir(pth))
+                if not os.path.islink(pth):
+                    checksums.extend(checksum_dir(pth))
             else:
                 checksum = checksum_file(pth)
                 checksums.append((pth, checksum))

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