summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarius Makovsky <traveltissues@protonmail.com>2019-08-20 16:36:02 +0100
committerbst-marge-bot <marge-bot@buildstream.build>2019-09-24 15:58:25 +0000
commitc9d1de5480c11423eb3c83559ffc607e735f0dcf (patch)
tree4260a1cd2a06a6f64d4ca96bdc71930abd22589c
parentb99451672bb4e9b6bb5c1d0583bc2608c56a3934 (diff)
downloadbuildstream-c9d1de5480c11423eb3c83559ffc607e735f0dcf.tar.gz
loader.py: 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 75db90d15..d578787a3 100644
--- a/src/buildstream/_loader/loader.py
+++ b/src/buildstream/_loader/loader.py
@@ -627,11 +627,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: