diff options
author | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-10-25 15:12:05 +0100 |
---|---|---|
committer | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-10-25 15:12:05 +0100 |
commit | b3ebec7c37681884fdab78d9eed3a191a9f5d859 (patch) | |
tree | 0fb3eed7608868fd5a46a7b6ce2e3667c2eedfba | |
parent | b320812d67d0095586b2006043cdb25ff46f8b30 (diff) | |
download | buildstream-b3ebec7c37681884fdab78d9eed3a191a9f5d859.tar.gz |
hack: remove files which previously blocked directory creation
-rw-r--r-- | buildstream/storage/_casbaseddirectory.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py index 761a55ba8..a5db96e2c 100644 --- a/buildstream/storage/_casbaseddirectory.py +++ b/buildstream/storage/_casbaseddirectory.py @@ -453,7 +453,10 @@ class CasBasedDirectory(Directory): directory = directory.descend(c, create=True) elif components: # Oh dear. We have components left to resolve, but the one we're trying to resolve points to a file. - raise VirtualDirectoryError("Reached a file called {} while trying to resolve a symlink; cannot proceed".format(c)) + print("Trying to resolve {}, but found {} was a file.".format(symlink.target, c)) + self.delete_entry(c) + directory = directory.descend(c, create=True) + #raise VirtualDirectoryError("Reached a file called {} while trying to resolve a symlink; cannot proceed".format(c)) else: return f else: |