diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-26 11:47:36 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-26 11:47:36 +0100 |
| commit | 7e4bdc7011564c64d1140eacbab58b875560dfa1 (patch) | |
| tree | dab4c6037f29069ae500ea1d494feb1085d8f450 /morphlib/buildenvironment.py | |
| parent | 293f39a24abfa12cc51e1f0633efd58761e18274 (diff) | |
| download | morph-7e4bdc7011564c64d1140eacbab58b875560dfa1.tar.gz | |
Fix how we set TMPDIR in the build environment
Diffstat (limited to 'morphlib/buildenvironment.py')
| -rw-r--r-- | morphlib/buildenvironment.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/morphlib/buildenvironment.py b/morphlib/buildenvironment.py index 2afa4a65..3e334135 100644 --- a/morphlib/buildenvironment.py +++ b/morphlib/buildenvironment.py @@ -44,7 +44,6 @@ class BuildEnvironment(): # copy a set of white-listed variables from the original env copied_vars = dict.fromkeys([ 'DISTCC_HOSTS', - 'TMPDIR', 'LD_PRELOAD', 'LD_LIBRARY_PATH', 'FAKEROOTKEY', @@ -61,6 +60,10 @@ class BuildEnvironment(): if copied_vars[name] is not None: env[name] = copied_vars[name] + if settings['bootstrap'] or not settings['staging-chroot']: + if 'TMPDIR' in self._osenv: + env['TMPDIR'] = self._osenv['TMPDIR'] + env['TERM'] = self._override_term env['SHELL'] = self._override_shell env['USER'] = \ |