summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim MacArthur <jim.macarthur@codethink.co.uk>2018-05-09 14:01:23 +0100
committerJim MacArthur <jim.macarthur@codethink.co.uk>2018-05-10 16:51:43 +0100
commita3dfc3fb9003b301fb7910c8986dc99e1b844d0d (patch)
tree8594217774652d2c38456a4e3efde42addca38c3
parent2e8748a89bad059abf4fd4b218874ed44cd302a1 (diff)
downloadbuildstream-jmac/virtual_directories_test.tar.gz
_stream.py: Alter _checkout_hardlinks to use can_destroyjmac/virtual_directories_test
-rw-r--r--buildstream/_stream.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/buildstream/_stream.py b/buildstream/_stream.py
index b7848c366..14a4a9ed3 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):