diff options
Diffstat (limited to 'bitbake/lib/bb/data.py')
-rw-r--r-- | bitbake/lib/bb/data.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 65144bfe52..ac0d8809cc 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py | |||
@@ -159,16 +159,17 @@ def expandKeys(alterdata, readdata = None): | |||
159 | ekey = todolist[key] | 159 | ekey = todolist[key] |
160 | renameVar(key, ekey, alterdata) | 160 | renameVar(key, ekey, alterdata) |
161 | 161 | ||
162 | def inheritFromOS(d, savedenv): | 162 | def inheritFromOS(d, savedenv, permitted): |
163 | """Inherit variables from the initial environment.""" | 163 | """Inherit variables from the initial environment.""" |
164 | exportlist = bb.utils.preserved_envvars_exported() | 164 | exportlist = bb.utils.preserved_envvars_exported() |
165 | for s in savedenv.keys(): | 165 | for s in savedenv.keys(): |
166 | try: | 166 | if s in permitted: |
167 | setVar(s, getVar(s, savedenv, True), d) | 167 | try: |
168 | if s in exportlist: | 168 | setVar(s, getVar(s, savedenv, True), d) |
169 | setVarFlag(s, "export", True, d) | 169 | if s in exportlist: |
170 | except TypeError: | 170 | setVarFlag(s, "export", True, d) |
171 | pass | 171 | except TypeError: |
172 | pass | ||
172 | 173 | ||
173 | def emit_var(var, o=sys.__stdout__, d = init(), all=False): | 174 | def emit_var(var, o=sys.__stdout__, d = init(), all=False): |
174 | """Emit a variable to be sourced by a shell.""" | 175 | """Emit a variable to be sourced by a shell.""" |