This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch jmac/googlecas_and_virtual_directories_1 in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 9ca87818ba2e3ef398b75db1b3973867f745fd48 Author: Jim MacArthur <[email protected]> AuthorDate: Tue May 8 16:27:45 2018 +0100 plugins/elements/stack.py: Convert to virtual directories --- buildstream/plugins/elements/stack.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/buildstream/plugins/elements/stack.py b/buildstream/plugins/elements/stack.py index 45c49c5..5b237d2 100644 --- a/buildstream/plugins/elements/stack.py +++ b/buildstream/plugins/elements/stack.py @@ -24,7 +24,6 @@ Stack elements are simply a symbolic element used for representing a logical group of elements. """ -import os from buildstream import Element @@ -52,7 +51,7 @@ class StackElement(Element): # Just create a dummy empty artifact, its existence is a statement # that all this stack's dependencies are built. - rootdir = sandbox.get_directory() + vrootdir = sandbox.get_virtual_directory() # XXX FIXME: This is currently needed because the artifact # cache wont let us commit an empty artifact. @@ -61,10 +60,7 @@ class StackElement(Element): # 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. - outputdir = os.path.join(rootdir, 'output', 'bst') - - # Ensure target directory parent - os.makedirs(os.path.dirname(outputdir), exist_ok=True) + vrootdir.descend(['output', 'bst'], create=True) # And we're done return '/output'
