diff options
| author | Chandan Singh <csingh43@bloomberg.net> | 2019-04-19 22:02:00 +0100 |
|---|---|---|
| committer | Chandan Singh <chandan@chandansingh.net> | 2019-04-22 12:28:15 +0000 |
| commit | 1cbc5e63dc10c7676237fa923273a3937d6977ca (patch) | |
| tree | 3b5f337ab360dc9f41ec706de074c57f086a251e | |
| parent | 5ed907bed61dac1168e89b6e0534ae74bf9af6aa (diff) | |
| download | buildstream-chandan/fix-assemble-stack.tar.gz | |
stack.py: Stop creating empty bst directorychandan/fix-assemble-stack
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.
| -rw-r--r-- | buildstream/plugins/elements/stack.py | 10 |
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' |