[buildstream] 16/41: _stream.py: Alter _checkout_hardlinks to use can_destroy

[tv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tvb pushed a commit to branch jmac/googlecas_and_virtual_directories_1
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 44a838b9cc3fec894ee78b2525a391111b22a65e
Author: Jim MacArthur <ji...@codethink.co.uk>
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 0c46ab3..1c2494f 100644
--- a/buildstream/_stream.py
+++ b/buildstream/_stream.py
@@ -936,12 +936,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):