diff options
author | James Ennis <james.ennis@codethink.co.uk> | 2019-09-11 17:48:49 +0100 |
---|---|---|
committer | James Ennis <james.ennis@codethink.co.uk> | 2019-09-13 16:04:12 +0100 |
commit | 25b3f7009aacad8fcfe0364f731573acf2149ece (patch) | |
tree | 2c964bff85c30b1b73b50522c8a692b203844d8c /src/buildstream/_frontend | |
parent | a6574793018107df79404298308721e9b9ef826c (diff) | |
download | buildstream-25b3f7009aacad8fcfe0364f731573acf2149ece.tar.gz |
_stream.py: Load the appropriate PipelineSelection in checkout
This patch ensures checkout behaves like the rest of our
commands which support --deps options. That is, we carry
the "deps" string through to the Stream and load the
corresponding PipelineSelection.
Diffstat (limited to 'src/buildstream/_frontend')
-rw-r--r-- | src/buildstream/_frontend/cli.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/buildstream/_frontend/cli.py b/src/buildstream/_frontend/cli.py index f9c3e9546..931f531aa 100644 --- a/src/buildstream/_frontend/cli.py +++ b/src/buildstream/_frontend/cli.py @@ -1080,8 +1080,6 @@ def artifact_checkout(app, force, deps, integrate, hardlinks, tar, compression, When this command is executed from a workspace directory, the default is to checkout the artifact of the workspace element. """ - from ..element import Scope - if hardlinks and tar: click.echo("ERROR: options --hardlinks and --tar conflict", err=True) sys.exit(-1) @@ -1121,11 +1119,10 @@ def artifact_checkout(app, force, deps, integrate, hardlinks, tar, compression, if not target: raise AppError('Missing argument "ELEMENT".') - scope = {'run': Scope.RUN, 'build': Scope.BUILD, 'none': Scope.NONE, 'all': Scope.ALL} app.stream.checkout(target, location=location, force=force, - scope=scope[deps], + selection=deps, integrate=True if integrate is None else integrate, hardlinks=hardlinks, pull=pull_, |