summaryrefslogtreecommitdiff
path: root/morph
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-05-16 14:59:02 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-05-16 14:59:02 +0000
commit9dfa4d9e120b70d26ae660b6a55e8d4bc198ff3f (patch)
treeeb0171882bb2acad3abb63a24d2c217803d107a0 /morph
parentc19502cb7e9fab6838b4d3e059f28fc459560667 (diff)
downloadmorph-9dfa4d9e120b70d26ae660b6a55e8d4bc198ff3f.tar.gz
Unpack artifacts in the staging area in the order they were built.
This is important because otherwise we might install D-Bus after fhs-dirs, the latter of which installs directories necessary for the former. This wouldn't work.
Diffstat (limited to 'morph')
-rwxr-xr-xmorph6
1 files changed, 3 insertions, 3 deletions
diff --git a/morph b/morph
index 55e9224a..91fb2122 100755
--- a/morph
+++ b/morph
@@ -284,7 +284,7 @@ class Morph(cliapp.Application):
if setup_proc:
builder.setup_proc = True
- to_be_installed = set()
+ to_be_installed = []
for group in order.groups:
for artifact in group:
@@ -298,7 +298,7 @@ class Morph(cliapp.Application):
self.msg(' Installing %s' % chunk_artifact.name)
handle = lac.get(chunk_artifact)
staging_area.install_artifact(handle)
- to_be_installed.clear()
+ to_be_installed = []
builder.build_and_cache(artifact)
else:
@@ -306,7 +306,7 @@ class Morph(cliapp.Application):
self.msg('Using cached %s' % artifact.name)
if install_chunks:
- to_be_installed.update(
+ to_be_installed.extend(
[x for x in group
if x.source.morphology['kind'] == 'chunk'])