From 840e587e88bd85945beb8fd717ce12913b694297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Wed, 8 Nov 2017 17:24:41 +0100 Subject: _pipeline.py: Load platform before creating Loader instance This allows platform access in Loader code. --- buildstream/_pipeline.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildstream/_pipeline.py b/buildstream/_pipeline.py index 2a64e2f99..c2d11c847 100644 --- a/buildstream/_pipeline.py +++ b/buildstream/_pipeline.py @@ -128,17 +128,17 @@ class Pipeline(): self.unused_workspaces = [] self._resolved_elements = {} + # Load selected platform + Platform._create_instance(context, project) + self.platform = Platform.get_platform() + self.artifacts = self.platform.artifactcache + loader = Loader(self.project.element_path, targets + except_, self.project._options) meta_elements = loader.load(rewritable, load_ticker) if load_ticker: load_ticker(None) - # Load selected platform - Platform._create_instance(context, project) - self.platform = Platform.get_platform() - self.artifacts = self.platform.artifactcache - # Create the factories after resolving the project pluginbase = PluginBase(package='buildstream.plugins') self.element_factory = ElementFactory(pluginbase, project._plugin_element_paths) -- cgit v1.2.1