summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--buildstream/_pipeline.py2
2 files changed, 1 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 953ede75e..ca297a409 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,10 +72,7 @@ linting:
variables:
PYTEST_ADDOPTS: "--color=yes"
script:
- - cd dist && ./unpack.sh && cd buildstream
- python3 setup.py test --addopts '--no-cov --pylint --pep8 -m "pep8 or pylint"'
- dependencies:
- - source_dist
# Run premerge commits
#
diff --git a/buildstream/_pipeline.py b/buildstream/_pipeline.py
index 9ce97cea3..85c3574ff 100644
--- a/buildstream/_pipeline.py
+++ b/buildstream/_pipeline.py
@@ -687,7 +687,7 @@ class Pipeline():
if workspace_dir is None:
raise PipelineError("Workspace '{}' is currently not defined"
- .format(target.name + " - " + str(source_index)))
+ .format(target.name))
self.close_workspace(True)