diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2019-04-10 16:44:00 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-04-10 16:44:00 +0000 |
| commit | b9cdf82c6c33d18ae08d17dce5fa041486893ec0 (patch) | |
| tree | 76e3bbfad91e563d517ef2387982be7e0d9972dc | |
| parent | a2da1f180802518bcd0b2d054098e4986ae2d771 (diff) | |
| parent | 3c0f540dd620de30445ac2351821c9a395aa750f (diff) | |
| download | buildstream-b9cdf82c6c33d18ae08d17dce5fa041486893ec0.tar.gz | |
Merge branch 'chandan/fix-default-target-junctions' into 'master'
_project.py: Do not find default targets in .bst directory
Closes #992
See merge request BuildStream/buildstream!1284
| -rw-r--r-- | buildstream/_project.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/buildstream/_project.py b/buildstream/_project.py index af0c8d7b3..93ed9fc3e 100644 --- a/buildstream/_project.py +++ b/buildstream/_project.py @@ -543,7 +543,11 @@ class Project(): # If default targets are not configured, default to all project elements default_targets = [] - for root, _, files in os.walk(self.element_path): + for root, dirs, files in os.walk(self.element_path): + # Do not recurse down the ".bst" directory which is where we stage + # junctions and other BuildStream internals. + if ".bst" in dirs: + dirs.remove(".bst") for file in files: if file.endswith(".bst"): rel_dir = os.path.relpath(root, self.element_path) |