]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstate: Fix SSTATE_DUPWHITELIST variable usage
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 26 Sep 2012 11:45:17 +0000 (12:45 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 26 Sep 2012 13:40:46 +0000 (14:40 +0100)
We need to split this variable before using it. Otherwise a single "/"
character in the list whitelists every overlapping sysroot file which
was not the intention making the whole thing useless.

We'll start seeing warnings about overlapping files now this is working
correctly after this patch.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/sstate.bbclass

index 6ccaf6d682867f78cb64d0d5eef0d11dbe342a50..0037ce5638ba04371c9f696fabf25e189009f4f4 100644 (file)
@@ -144,7 +144,7 @@ def sstate_install(ss, d):
 
     # Check the file list for conflicts against the master manifest
     mastermanifest = d.getVar("SSTATE_MASTERMANIFEST", True)
-    whitelist = d.getVar("SSTATE_DUPWHITELIST", True)
+    whitelist = (d.getVar("SSTATE_DUPWHITELIST", True) or "").split()
     lock = bb.utils.lockfile(mastermanifest + ".lock")
     if not os.path.exists(mastermanifest):
         open(mastermanifest, "w").close()