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/builder2.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/builder2.py')
| -rw-r--r-- | morphlib/builder2.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py index 59c62222..459094f4 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -314,6 +314,10 @@ class ChunkBuilder(BuilderBase): for line in f: logging.error('OUTPUT FROM FAILED BUILD: %s' % line.rstrip('\n')) + src_dir = self.staging_area.dirname + dest_dir = os.path.join(self.app.settings['tempdir'], + 'failed') + cliapp.runcmd(['mv', src_dir, dest_dir]) raise self.staging_area.chroot_close() built_artifacts = self.assemble_chunk_artifacts(destdir) |