summaryrefslogtreecommitdiff
path: root/morphlib
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-10-17 21:20:02 +0100
committerLars Wirzenius <liw@liw.fi>2011-10-17 21:20:02 +0100
commita18ccd50a3eab8be0181f9f1b4b25266f4c9ae53 (patch)
tree2668f03b03b0e5df866884b19460eb0a1a8c52be /morphlib
parent115b0755e48111a8e85a370a7f52fa9dca95964b (diff)
downloadmorph-a18ccd50a3eab8be0181f9f1b4b25266f4c9ae53.tar.gz
Get rid of semi-useless create_stratum method.
Diffstat (limited to 'morphlib')
-rw-r--r--morphlib/builder.py19
1 files changed, 5 insertions, 14 deletions
diff --git a/morphlib/builder.py b/morphlib/builder.py
index cc432a17..09dcbd9f 100644
--- a/morphlib/builder.py
+++ b/morphlib/builder.py
@@ -112,22 +112,13 @@ class Builder(object):
chunk_repo, chunk_ref)
morphlib.bins.unpack_chunk(filename, self._inst)
self.prepare_binary_metadata(morph)
- stratum_filename = self.create_stratum(morph)
- self.tempdir.clear()
- return stratum_filename
- def create_stratum(self, morph):
- '''Create a Baserock stratum from the ``self._inst`` directory.
-
- The directory must be filled in with all the relevant files already.
-
- '''
+ stratum_filename = self.get_cached_name(morph.name, 'stratum', '', '')
+ self.msg('Creating stratum %s at %s' % (morph.name, stratum_filename))
+ morphlib.bins.create_stratum(self._inst, stratum_filename)
- # FIXME: Should put in stratum's git repo and reference here.
- filename = self.get_cached_name(morph.name, 'stratum', '', '')
- self.msg('Creating stratum %s at %s' % (morph.name, filename))
- morphlib.bins.create_stratum(self._inst, filename)
- return filename
+ self.tempdir.clear()
+ return stratum_filename
@property
def _build(self):