commit 7ff7fb5cde1b491c2e2a321b705d695f48980cfe
author bst-marge-bot <marge-bot@buildstream.build> Fri Jul 10 16:30:27 2020 +0000
committer bst-marge-bot <marge-bot@buildstream.build> Fri Jul 10 16:30:27 2020 +0000
tree 43629d9f62f5a1bcb9522bfc0b967a6e1d360100
parent 9330cda5ccc718e5bd9e9479a5dd457012b5d3bf
parent 0301ec2ed104bf54ba715aad055f5f7cd8d729dc

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

src/buildstream/_frontend/cli.py

diff --git a/src/buildstream/_frontend/cli.py b/src/buildstream/_frontend/cli.py
index 0adfdd8..b9cb266 100644
--- a/src/buildstream/_frontend/cli.py
+++ b/src/buildstream/_frontend/cli.py
@@ -1249,10 +1249,10 @@
         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