diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2013-06-05 13:31:13 +0000 |
|---|---|---|
| committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2013-06-05 16:59:29 +0000 |
| commit | b4a633a5229b6c3380cde0cc67da037ea8091008 (patch) | |
| tree | c5f61a51eedbf5600ac9bcaa0249ce422ead7e6e /morphlib/stagingarea.py | |
| parent | 86cbc1bc8ef84dc9496d7723a15dec9b43eacb73 (diff) | |
| download | morph-b4a633a5229b6c3380cde0cc67da037ea8091008.tar.gz | |
Change the structure of the temporary directory used by morph
Now, inside the temporary directory we will have the following
subdirectories: chunks, staging, failed and deployments. The failed
directory will contain the staging areas of failed builds.
Diffstat (limited to 'morphlib/stagingarea.py')
| -rw-r--r-- | morphlib/stagingarea.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/stagingarea.py b/morphlib/stagingarea.py index 8150ba42..8e92e039 100644 --- a/morphlib/stagingarea.py +++ b/morphlib/stagingarea.py @@ -44,7 +44,7 @@ class StagingArea(object): self.dirname = dirname self.builddirname = None self.destdirname = None - self.mounted = None + self.mounted = [] self._bind_readonly_mount = None self.use_chroot = use_chroot @@ -61,7 +61,7 @@ class StagingArea(object): # Wrapper to be overridden by unit tests. def _mkdir(self, dirname): # pragma: no cover - os.mkdir(dirname) + os.makedirs(dirname) def _dir_for_source(self, source, suffix): dirname = os.path.join(self.dirname, @@ -160,6 +160,7 @@ class StagingArea(object): unpacked_artifact = os.path.join( self._app.settings['tempdir'], + 'chunks', os.path.basename(handle.name) + '.d') if not os.path.exists(unpacked_artifact): self._mkdir(unpacked_artifact) @@ -220,7 +221,6 @@ class StagingArea(object): return ccache_destdir def do_mounts(self, setup_mounts): # pragma: no cover - self.mounted = [] if not setup_mounts: return for mount_point, mount_type, source in self.to_mount: |