[oe-commits] [openembedded-core] 07/25: sstate.bbclass: normalize whitelisted paths

[git at git.openembedded.org]

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

commit d82acf20541463b14a811788d28fb1db3539885b
Author: Max Krummenacher <max.oss.09 at gmail.com>
AuthorDate: Sun Sep 11 19:13:20 2016 +0200

    sstate.bbclass: normalize whitelisted paths
    
    Without this a whitelisted path containing /../ breaks the test for a file
    allowed to be provided by more than one recipe.
    
    Noticed when local.conf contains:
    DEPLOY_DIR = "${TOPDIR}/../deploy"
    
    |ERROR: core-image-minimal-1.0-r0 do_image_complete: The recipe
    | core-image-minimal is trying to install files into a shared area when those
    | files already exist. Those files and their manifest location are:
    | .../poky/deploy/images/qemux86/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
    | Matched in b'manifest-qemux86-linux-yocto.deploy'
    
    Signed-off-by: Max Krummenacher <max.krummenacher at toradex.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/sstate.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 8b6ac50..216e133 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -205,6 +205,7 @@ def sstate_install(ss, d):
             f = os.path.normpath(f)
             realmatch = True
             for w in whitelist:
+                w = os.path.normpath(w)
                 if f.startswith(w):
                     realmatch = False
                     break

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