summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2019-04-22 13:01:34 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-04-22 13:01:34 +0000
commit58d8b1c7c22b9cf67a73d930ac62a78d9a396c4d (patch)
tree3b5f337ab360dc9f41ec706de074c57f086a251e
parent5ed907bed61dac1168e89b6e0534ae74bf9af6aa (diff)
parent1cbc5e63dc10c7676237fa923273a3937d6977ca (diff)
downloadbuildstream-58d8b1c7c22b9cf67a73d930ac62a78d9a396c4d.tar.gz
Merge branch 'chandan/fix-assemble-stack' into 'master'
stack.py: Stop creating empty bst directory Closes #998 See merge request BuildStream/buildstream!1301
-rw-r--r--buildstream/plugins/elements/stack.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/buildstream/plugins/elements/stack.py b/buildstream/plugins/elements/stack.py
index b26281fe4..97517ca48 100644
--- a/buildstream/plugins/elements/stack.py
+++ b/buildstream/plugins/elements/stack.py
@@ -55,15 +55,7 @@ class StackElement(Element):
# Just create a dummy empty artifact, its existence is a statement
# that all this stack's dependencies are built.
vrootdir = sandbox.get_virtual_directory()
-
- # XXX FIXME: This is currently needed because the artifact
- # cache wont let us commit an empty artifact.
- #
- # We need to fix the artifact cache so that it stores
- # the actual artifact data in a subdirectory, then we
- # will be able to store some additional state in the
- # artifact cache, and we can also remove this hack.
- vrootdir.descend('output', 'bst', create=True)
+ vrootdir.descend('output', create=True)
# And we're done
return '/output'