From a68ea0772bf1b686da3a5b91b507eff20c133ff4 Mon Sep 17 00:00:00 2001 From: Angelos Evripiotis Date: Fri, 18 Jan 2019 17:03:12 +0000 Subject: Fixup refs to 'bst fetch' Now that 'bst fetch' is obsolete, change guidance to refer to the replacement 'bst source fetch' instead. --- buildstream/_loader/loader.py | 2 +- buildstream/_pipeline.py | 2 +- buildstream/plugins/elements/junction.py | 4 ++-- doc/source/using_commands.rst | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildstream/_loader/loader.py b/buildstream/_loader/loader.py index 25c263011..13761fb31 100644 --- a/buildstream/_loader/loader.py +++ b/buildstream/_loader/loader.py @@ -557,7 +557,7 @@ class Loader(): ticker(filename, 'Fetching subproject from {} source'.format(source.get_kind())) source._fetch(sources[0:idx]) else: - detail = "Try fetching the project with `bst fetch {}`".format(filename) + detail = "Try fetching the project with `bst source fetch {}`".format(filename) raise LoadError(LoadErrorReason.SUBPROJECT_FETCH_NEEDED, "Subproject fetch needed for junction: {}".format(filename), detail=detail) diff --git a/buildstream/_pipeline.py b/buildstream/_pipeline.py index 8f6c78894..7cf36f5a7 100644 --- a/buildstream/_pipeline.py +++ b/buildstream/_pipeline.py @@ -406,7 +406,7 @@ class Pipeline(): if source._get_consistency() != Consistency.CACHED: detail += " {}\n".format(source) detail += '\n' - detail += "Try fetching these elements first with `bst fetch`,\n" + \ + detail += "Try fetching these elements first with `bst source fetch`,\n" + \ "or run this command with `--fetch` option\n" raise PipelineError("Uncached sources", detail=detail, reason="uncached-sources") diff --git a/buildstream/plugins/elements/junction.py b/buildstream/plugins/elements/junction.py index a2ae3b6cb..2550e1f79 100644 --- a/buildstream/plugins/elements/junction.py +++ b/buildstream/plugins/elements/junction.py @@ -93,7 +93,7 @@ cached yet. However, they can be fetched explicitly: .. code:: - bst fetch junction.bst + bst source fetch junction.bst Other commands such as ``bst build`` implicitly fetch junction sources. @@ -146,7 +146,7 @@ class JunctionElement(Element): def get_unique_key(self): # Junctions do not produce artifacts. get_unique_key() implementation - # is still required for `bst fetch`. + # is still required for `bst source fetch`. return 1 def configure_sandbox(self, sandbox): diff --git a/doc/source/using_commands.rst b/doc/source/using_commands.rst index eb6e9d16e..7022b2edc 100644 --- a/doc/source/using_commands.rst +++ b/doc/source/using_commands.rst @@ -40,7 +40,7 @@ project's main directory. .. _invoking_fetch: .. click:: buildstream._frontend.cli:fetch - :prog: bst fetch + :prog: bst source fetch ---- -- cgit v1.2.1