From 1cbc5e63dc10c7676237fa923273a3937d6977ca Mon Sep 17 00:00:00 2001 From: Chandan Singh Date: Fri, 19 Apr 2019 22:02:00 +0100 Subject: stack.py: Stop creating empty bst directory It seems like this hack was added as a workaround for OSTree's limitations to commit an empty directory, originally in https://gitlab.com/BuildStream/buildstream/commit/91940a6cba193ac0e20c01008335617847be27a5. Since we do not have this limitation anymore, stop creating this empty directory. Fixes #998. --- buildstream/plugins/elements/stack.py | 10 +--------- 1 file changed, 1 insertion(+), 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' -- cgit v1.2.1