summaryrefslogtreecommitdiffstats
path: root/meta/classes/sstate.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r--meta/classes/sstate.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 7aca415159..163bdf0b5f 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -259,13 +259,13 @@ def sstate_install(ss, d):
259 shareddirs.append(dstdir) 259 shareddirs.append(dstdir)
260 260
261 # Check the file list for conflicts against files which already exist 261 # Check the file list for conflicts against files which already exist
262 whitelist = (d.getVar("SSTATE_ALLOW_OVERLAP_FILES") or "").split() 262 overlap_allowed = (d.getVar("SSTATE_ALLOW_OVERLAP_FILES") or "").split()
263 match = [] 263 match = []
264 for f in sharedfiles: 264 for f in sharedfiles:
265 if os.path.exists(f) and not os.path.islink(f): 265 if os.path.exists(f) and not os.path.islink(f):
266 f = os.path.normpath(f) 266 f = os.path.normpath(f)
267 realmatch = True 267 realmatch = True
268 for w in whitelist: 268 for w in overlap_allowed:
269 w = os.path.normpath(w) 269 w = os.path.normpath(w)
270 if f.startswith(w): 270 if f.startswith(w):
271 realmatch = False 271 realmatch = False