diff options
author | Jürg Billeter <j@bitron.ch> | 2019-03-14 15:40:14 +0000 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2019-03-25 10:24:41 +0100 |
commit | 3e586591349bef3b269414debd80ca44d6d2d6fa (patch) | |
tree | 66920d930b12c5ca1fa753c8ddddc2ef4e1a7840 /buildstream | |
parent | 190c272d8e31aac5ef83da7ab4f40ac543a163f6 (diff) | |
download | buildstream-3e586591349bef3b269414debd80ca44d6d2d6fa.tar.gz |
cascache.py: Do not silently ignore missing directories in checkout()
Outside tests, CASCache.checkout() is used only in
CasBasedDirectory.export() and we don't want to silently ignore missing
directories when exporting files.
Diffstat (limited to 'buildstream')
-rw-r--r-- | buildstream/_cas/cascache.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/buildstream/_cas/cascache.py b/buildstream/_cas/cascache.py index 46bd7d945..63871ebe4 100644 --- a/buildstream/_cas/cascache.py +++ b/buildstream/_cas/cascache.py @@ -198,10 +198,8 @@ class CASCache(): stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) for dirnode in directory.directories: - # Don't try to checkout a dangling ref - if os.path.exists(self.objpath(dirnode.digest)): - fullpath = os.path.join(dest, dirnode.name) - self.checkout(fullpath, dirnode.digest, can_link=can_link) + fullpath = os.path.join(dest, dirnode.name) + self.checkout(fullpath, dirnode.digest, can_link=can_link) for symlinknode in directory.symlinks: # symlink |