diff options
| author | Saul Wold <Saul.Wold@windriver.com> | 2022-03-09 09:40:52 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-10 08:00:28 +0000 |
| commit | d9e500f83d0223925ca2595c77c8fb45eab10f7c (patch) | |
| tree | 5b8fc1787ced86daebd7a7e26dd3bd69f9d5551b /meta/classes/sstate.bbclass | |
| parent | 8827a3ed80ec8f0adcf4b778f88cb8f9f051262b (diff) | |
| download | poky-d9e500f83d0223925ca2595c77c8fb45eab10f7c.tar.gz | |
meta/scripts: Improve internal variable naming
Update internal variable names to improve the terms used.
(From OE-Core rev: f408068e5d7998ae165f3002e51bc54b380b8099)
Signed-off-by: Saul Wold <saul.wold@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
| -rw-r--r-- | meta/classes/sstate.bbclass | 4 |
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 |
