From 9dfa4d9e120b70d26ae660b6a55e8d4bc198ff3f Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Wed, 16 May 2012 14:59:02 +0000 Subject: 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. --- morph | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'morph') 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']) -- cgit v1.2.1