diff options
Diffstat (limited to 'src/buildstream/_project.py')
-rw-r--r-- | src/buildstream/_project.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/buildstream/_project.py b/src/buildstream/_project.py index 1fdc84acb..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 @@ -440,18 +440,13 @@ class Project(): # targets (list): Target names # rewritable (bool): Whether the loaded files should be rewritable # this is a bit more expensive due to deep copies - # fetch_subprojects (bool): Whether we should fetch subprojects as a part of the - # loading process, if they are not yet locally cached # # Returns: # (list): A list of loaded Element # - def load_elements(self, targets, *, - rewritable=False, fetch_subprojects=False): + def load_elements(self, targets, *, rewritable=False): with self._context.timed_activity("Loading elements", silent_nested=True): - meta_elements = self.loader.load(targets, rewritable=rewritable, - ticker=None, - fetch_subprojects=fetch_subprojects) + meta_elements = self.loader.load(targets, rewritable=rewritable, ticker=None) with self._context.timed_activity("Resolving elements"): elements = [ @@ -558,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) @@ -613,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) |