From 3dc95d4ba2bf6c236bc69f35c098f563ab0f65aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Thu, 14 Mar 2019 09:48:54 +0000 Subject: cascache.py: Handle missing subdir case in contains_subdir_artifacts() Return False instead of raising an error. --- buildstream/_cas/cascache.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'buildstream') diff --git a/buildstream/_cas/cascache.py b/buildstream/_cas/cascache.py index 2be16067b..e07b4d4b4 100644 --- a/buildstream/_cas/cascache.py +++ b/buildstream/_cas/cascache.py @@ -128,12 +128,14 @@ class CASCache(): def contains_subdir_artifact(self, ref, subdir): tree = self.resolve_ref(ref) - # This assumes that the subdir digest is present in the element tree - subdirdigest = self._get_subdir(tree, subdir) - objpath = self.objpath(subdirdigest) + try: + subdirdigest = self._get_subdir(tree, subdir) + objpath = self.objpath(subdirdigest) - # True if subdir content is cached or if empty as expected - return os.path.exists(objpath) + # True if subdir content is cached or if empty as expected + return os.path.exists(objpath) + except CASCacheError: + return False # checkout(): # -- cgit v1.2.1