summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2018-11-06 17:33:03 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2018-12-11 12:56:32 +0000
commit921f2bcbd6bc050c77a6099d9b90705953f93622 (patch)
tree88e29d208a6e8479e1b8737f3c89f47ed9f38167
parent496f0ab74c7955fb71754babc9561a16f8dfea1c (diff)
downloadbuildstream-921f2bcbd6bc050c77a6099d9b90705953f93622.tar.gz
_workspaces.py: Do not include .bstproject.yaml in the cache key
This is a part of #222
-rw-r--r--buildstream/_workspaces.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/buildstream/_workspaces.py b/buildstream/_workspaces.py
index 466c55ce7..24a3cc8d3 100644
--- a/buildstream/_workspaces.py
+++ b/buildstream/_workspaces.py
@@ -370,10 +370,15 @@ class Workspace():
if recalculate or self._key is None:
fullpath = self.get_absolute_path()
+ excluded_files = (WORKSPACE_PROJECT_FILE,)
+
# Get a list of tuples of the the project relative paths and fullpaths
if os.path.isdir(fullpath):
filelist = utils.list_relative_paths(fullpath)
- filelist = [(relpath, os.path.join(fullpath, relpath)) for relpath in filelist]
+ filelist = [
+ (relpath, os.path.join(fullpath, relpath)) for relpath in filelist
+ if relpath not in excluded_files
+ ]
else:
filelist = [(self.get_absolute_path(), fullpath)]