This is an automated email from the ASF dual-hosted git repository. not-in-ldap pushed a commit to branch jmac/virtual_directories_test in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit a3dfc3fb9003b301fb7910c8986dc99e1b844d0d Author: Jim MacArthur <[email protected]> AuthorDate: Wed May 9 14:01:23 2018 +0100 _stream.py: Alter _checkout_hardlinks to use can_destroy --- buildstream/_stream.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/buildstream/_stream.py b/buildstream/_stream.py index b7848c3..14a4a9e 100644 --- a/buildstream/_stream.py +++ b/buildstream/_stream.py @@ -927,12 +927,10 @@ class Stream(): raise StreamError("Failed to remove checkout directory: {}".format(e)) from e if removed: - # TODO: Direct rename is no longer possible with the new Virtual Directory interface. - # See what options there are to restore it. os.makedirs(directory, exist_ok=True) - sandbox_vroot.export_files(directory, can_link=True) + sandbox_vroot.export_files(directory, can_link=True, can_destroy=True) else: - sandbox_vroot.export_files(directory, can_link=True) + sandbox_vroot.export_files(directory, can_link=True, can_destroy=False) # Write the element build script to the given directory def _write_element_script(self, directory, element):
