summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarius Makovsky <traveltissues@protonmail.com>2019-08-20 16:36:02 +0100
committerDarius Makovsky <traveltissues@protonmail.com>2019-09-05 17:52:52 +0100
commitbbeb04fcdd0ae792dc06e502e03da79a9d1bc609 (patch)
tree6ffb3b4e8669df2ea9864e90bdd79c21b5435879
parenta011c5d1094ee803824fbe63917ec6e7c6da129e (diff)
downloadbuildstream-bbeb04fcdd0ae792dc06e502e03da79a9d1bc609.tar.gz
Remove workspace handling in element collection
-rw-r--r--src/buildstream/_loader/loader.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/buildstream/_loader/loader.py b/src/buildstream/_loader/loader.py
index 69f425b41..9d0fecfe0 100644
--- a/src/buildstream/_loader/loader.py
+++ b/src/buildstream/_loader/loader.py
@@ -604,11 +604,7 @@ class Loader():
LoadErrorReason.SUBPROJECT_INCONSISTENT, detail=detail)
sources = list(element.sources())
- workspace = element._get_workspace()
- if workspace:
- # If a workspace is open, load it from there instead
- basedir = workspace.get_absolute_path()
- elif len(sources) == 1 and sources[0]._get_local_path():
+ if len(sources) == 1 and sources[0]._get_local_path():
# Optimization for junctions with a single local source
basedir = sources[0]._get_local_path()
else: