diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2013-06-05 18:38:31 +0100 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2013-06-05 18:38:31 +0100 |
commit | 710af7e4bc5e3654221ce23d5b3ccbafbd0eae0c (patch) | |
tree | 8ef2cd494d0ca0b7bba7daec00171dea7821e756 /morphlib/plugins/deploy_plugin.py | |
parent | 7e74c354db185291ae9fecb8fef2d7ebb172c3d1 (diff) | |
parent | b4a633a5229b6c3380cde0cc67da037ea8091008 (diff) | |
download | morph-710af7e4bc5e3654221ce23d5b3ccbafbd0eae0c.tar.gz |
Merge branch 'baserock/tiagogomes/tmpdir' of git://git.baserock.org/baserock/baserock/morph
I had fixed an conflict and change to use morph_tmp instead of
morph as default temp dir.
Reviewed by Lars Wirzenius
Conflicts:
morphlib/app.py
Diffstat (limited to 'morphlib/plugins/deploy_plugin.py')
-rw-r--r-- | morphlib/plugins/deploy_plugin.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py index 574a5e04..6b3b128f 100644 --- a/morphlib/plugins/deploy_plugin.py +++ b/morphlib/plugins/deploy_plugin.py @@ -137,7 +137,9 @@ class DeployPlugin(cliapp.Plugin): # Unpack the artifact (tarball) to a temporary directory. self.app.status(msg='Unpacking system for configuration') - system_tree = tempfile.mkdtemp(dir=self.app.settings['tempdir']) + deployment_dir = os.path.join(self.app.settings['tempdir'], + 'deployments') + system_tree = tempfile.mkdtemp(dir=deployment_dir) if build_command.lac.has(artifact): f = build_command.lac.get(artifact) @@ -166,7 +168,8 @@ class DeployPlugin(cliapp.Plugin): if 'TMPDIR' not in env: # morphlib.app already took care of ensuring the tempdir setting # is good, so use it if we don't have one already set. - env['TMPDIR'] = self.app.settings['tempdir'] + env['TMPDIR'] = os.path.join(self.app.settings['tempdir'], + 'deployments') # Run configuration extensions. self.app.status(msg='Configure system') |