diff options
author | Jürg Billeter <j@bitron.ch> | 2019-06-19 10:57:21 +0200 |
---|---|---|
committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-06-25 09:08:17 +0000 |
commit | 737aea1840253abddc3468743cedb4b706f734a5 (patch) | |
tree | 76ffe0de723ad59e00f5c864628f22a4f22916b7 /src/buildstream/_project.py | |
parent | 4c50ba274e1fbd5b15ce316621e81ad8bdcabdbf (diff) | |
download | buildstream-737aea1840253abddc3468743cedb4b706f734a5.tar.gz |
Handle subproject fetching in the Stream class
Diffstat (limited to 'src/buildstream/_project.py')
-rw-r--r-- | src/buildstream/_project.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/buildstream/_project.py b/src/buildstream/_project.py index 0787a7bf4..114d25054 100644 --- a/src/buildstream/_project.py +++ b/src/buildstream/_project.py @@ -95,7 +95,7 @@ class Project(): def __init__(self, directory, context, *, junction=None, cli_options=None, default_mirror=None, parent_loader=None, - search_for_project=True): + search_for_project=True, fetch_subprojects=None): # The project name self.name = None @@ -157,7 +157,7 @@ class Project(): self._project_includes = None with PROFILER.profile(Topics.LOAD_PROJECT, self.directory.replace(os.sep, '-')): - self._load(parent_loader=parent_loader) + self._load(parent_loader=parent_loader, fetch_subprojects=fetch_subprojects) self._partially_loaded = True @@ -553,7 +553,7 @@ class Project(): # # Raises: LoadError if there was a problem with the project.conf # - def _load(self, parent_loader=None): + def _load(self, *, parent_loader=None, fetch_subprojects): # Load builtin default projectfile = os.path.join(self.directory, _PROJECT_CONF_FILE) @@ -608,7 +608,7 @@ class Project(): self._fatal_warnings = _yaml.node_get(pre_config_node, list, 'fatal-warnings', default_value=[]) self.loader = Loader(self._context, self, - parent=parent_loader) + parent=parent_loader, fetch_subprojects=fetch_subprojects) self._project_includes = Includes(self.loader, copy_tree=False) |