diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2013-03-01 13:25:53 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-03-01 13:25:53 +0000 |
commit | c909f89474fbdb3a57e647f2edb81f45ef6a55f3 (patch) | |
tree | b3ba38c3b9ac82c40fc9f3618562c104edb4f3ce | |
parent | ff7980a4ddadbcad93acecaa94cdcfa2c6c8c244 (diff) | |
parent | 25d0ff32187362dc14a862b4964a6a91a2af7b04 (diff) | |
download | morph-c909f89474fbdb3a57e647f2edb81f45ef6a55f3.tar.gz |
Merge branch 'jonathanmaw/fix-tempdir-none' of ssh://trove.baserock.org/baserock/baserock/morph
-rwxr-xr-x | morphlib/app.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/morphlib/app.py b/morphlib/app.py index eaba5dd9..21e18e32 100755 --- a/morphlib/app.py +++ b/morphlib/app.py @@ -193,6 +193,11 @@ class Morph(cliapp.Application): if self.settings['compiler-cache-dir'] is None: self.settings['compiler-cache-dir'] = os.path.join( self.settings['cachedir'], 'ccache') + if self.settings['tempdir'] is None: + if 'TMPDIR' in os.environ: + self.settings['tempdir'] = os.environ['TMPDIR'] + else: + self.settings['tempdir'] = '/tmp' if 'MORPH_DUMP_PROCESSED_CONFIG' in os.environ: self.settings.dump_config(sys.stdout) sys.exit(0) |