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-07-05 14:07:43 +0100
commit1e82e98676ef3a2f095cd7b627defc7663dfec02 (patch)
treea6dfa3ae6eb9d7d9f79c57ea7231bd6e29f671aa
parent27060bfe09f7bab2117fbe9284437703fe9a0618 (diff)
downloadbuildstream-1e82e98676ef3a2f095cd7b627defc7663dfec02.tar.gz
_stream.py: Alter _checkout_hardlinks to use can_destroy
-rw-r--r--buildstream/_stream.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/buildstream/_stream.py b/buildstream/_stream.py
index 28a480982..5c0976bd7 100644
--- a/buildstream/_stream.py
+++ b/buildstream/_stream.py
@@ -997,12 +997,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):