diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2020-07-10 16:30:27 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-07-10 16:30:27 +0000 |
| commit | 7ff7fb5cde1b491c2e2a321b705d695f48980cfe (patch) | |
| tree | 43629d9f62f5a1bcb9522bfc0b967a6e1d360100 | |
| parent | 9330cda5ccc718e5bd9e9479a5dd457012b5d3bf (diff) | |
| parent | 0301ec2ed104bf54ba715aad055f5f7cd8d729dc (diff) | |
| download | buildstream-7ff7fb5cde1b491c2e2a321b705d695f48980cfe.tar.gz | |
Merge branch 'dwinship/dont-strip-bst-from-user-supplied-checkout-dir' into 'master'
Don't strip '.bst' from user-supplied checkout dir
Closes #1361
See merge request BuildStream/buildstream!1992
| -rw-r--r-- | src/buildstream/_frontend/cli.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buildstream/_frontend/cli.py b/src/buildstream/_frontend/cli.py index 0adfdd84a..b9cb26666 100644 --- a/src/buildstream/_frontend/cli.py +++ b/src/buildstream/_frontend/cli.py @@ -1249,10 +1249,10 @@ def artifact_checkout(app, force, deps, integrate, hardlinks, tar, compression, else: if directory is None: location = os.path.abspath(os.path.join(os.getcwd(), target)) + if location[-4:] == ".bst": + location = location[:-4] else: location = directory - if location[-4:] == ".bst": - location = location[:-4] tar = False else: location = tar |