From e59c7431725961e502e12a64c4a006905c3c5821 Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Tue, 31 Mar 2015 09:41:16 +0000 Subject: Morph build a82b16b8220f4f8080b0198619484887 System branch: master --- morphlib/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'morphlib/builder.py') diff --git a/morphlib/builder.py b/morphlib/builder.py index 9b01f983..1ae1eec8 100644 --- a/morphlib/builder.py +++ b/morphlib/builder.py @@ -522,7 +522,6 @@ class SystemBuilder(BuilderBase): # pragma: no cover for a_name, artifact in self.source.artifacts.iteritems(): try: fs_root = self.staging_area.destdir(self.source) - self.unpack_strata(fs_root) upperdir = self.staging_area.overlay_upperdir( self.source) editable_root = self.staging_area.overlaydir(self.source) @@ -531,6 +530,7 @@ class SystemBuilder(BuilderBase): # pragma: no cover if not os.path.exists(workdir): os.makedirs(workdir) union_filesystem = self.app.settings['union-filesystem'] + self.unpack_strata(fs_root) morphlib.fsutils.overlay_mount(self.app.runcmd, 'overlay-%s' % a_name, editable_root, fs_root, -- cgit v1.2.1