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-20 18:23:31 +0100
commit46df4e83d56b36f5a4e7ffabf29d432efb9c23e7 (patch)
treed30d51cc27e50bd9654beee68ddf2a8bb8f10ae9
parente5e178237a4ebdc75582acdc88e08173b01cbd1c (diff)
downloadbuildstream-46df4e83d56b36f5a4e7ffabf29d432efb9c23e7.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: