Skip to contentSkip to conversation

sstate: Fix SSTATE_DUPWHITELIST variable usage

PATCH Richard Purdie 1 participant 1 message Sep 26, 2012

lore
Share & tools
lore
#0 lore raw

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.

---

meta/classes/sstate.bbclass +1 -1
index 6ccaf6d..0037ce5 100644
@@ -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()