summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2017-11-08 17:24:41 +0100
committerJürg Billeter <j@bitron.ch>2017-11-30 15:04:47 +0000
commit840e587e88bd85945beb8fd717ce12913b694297 (patch)
tree1e2596016a9a17e747751197286a1b11df1f6779
parent90186c094f862e5101b22496a0c71f92949077e0 (diff)
downloadbuildstream-840e587e88bd85945beb8fd717ce12913b694297.tar.gz
_pipeline.py: Load platform before creating Loader instance
This allows platform access in Loader code.
-rw-r--r--buildstream/_pipeline.py10
1 files 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)