summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Ennis <james.ennis@codethink.com>2019-01-22 12:24:16 +0000
committerJames Ennis <james.ennis@codethink.com>2019-01-22 12:41:29 +0000
commit077d5a96fe82afb11238fc4e19166e07f9667ad0 (patch)
tree5c2f992cd00ceb096899e301b35629e6f3383ac3
parentd9072371f9e7c4dd058e92eb0830fc3bcc36f247 (diff)
downloadbuildstream-077d5a96fe82afb11238fc4e19166e07f9667ad0.tar.gz
Change bst checkout/pull/push references to bst artifact checkout/pull/push
-rw-r--r--buildstream/_artifactcache.py2
-rw-r--r--buildstream/element.py4
-rw-r--r--doc/source/arch_remote_execution.rst2
3 files changed, 4 insertions, 4 deletions
diff --git a/buildstream/_artifactcache.py b/buildstream/_artifactcache.py
index 16bde737b..9ccbebade 100644
--- a/buildstream/_artifactcache.py
+++ b/buildstream/_artifactcache.py
@@ -126,7 +126,7 @@ class ArtifactCache():
self._remotes_setup = True
# Initialize remote artifact caches. We allow the commandline to override
- # the user config in some cases (for example `bst push --remote=...`).
+ # the user config in some cases (for example `bst artifact push --remote=...`).
has_remote_caches = False
if remote_url:
self._set_remotes([ArtifactCacheSpec(remote_url, push=True)])
diff --git a/buildstream/element.py b/buildstream/element.py
index 89e3014c5..a243826ed 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -1334,11 +1334,11 @@ class Element(Plugin):
# _prepare_sandbox():
#
# This stages things for either _shell() (below) or also
- # is used to stage things by the `bst checkout` codepath
+ # is used to stage things by the `bst artifact checkout` codepath
#
@contextmanager
def _prepare_sandbox(self, scope, directory, shell=False, integrate=True, usebuildtree=False):
- # bst shell and bst checkout require a local sandbox.
+ # bst shell and bst artifact checkout require a local sandbox.
bare_directory = bool(directory)
with self.__sandbox(directory, config=self.__sandbox_config, allow_remote=False,
bare_directory=bare_directory) as sandbox:
diff --git a/doc/source/arch_remote_execution.rst b/doc/source/arch_remote_execution.rst
index 4e66d7719..efefc84b5 100644
--- a/doc/source/arch_remote_execution.rst
+++ b/doc/source/arch_remote_execution.rst
@@ -25,7 +25,7 @@ After a successful build, BuildStream will push the completed artifact to the re
Use of sandboxes outside builds
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Because staging requires *integration-commands* to be run, a sandbox is necessary for the *bst checkout* command to run.
+Because staging requires *integration-commands* to be run, a sandbox is necessary for the *bst artifact checkout* command to run.
A sandbox is also required for the *bst shell* command. Because the REAPI does not provide any mechanism for interactive use, *bst shell* will always use a local sandbox.