From 9ab3274393bda6c25e27c84210a97444cd4d4be4 Mon Sep 17 00:00:00 2001
From: Tristan Maat <tristan.maat@codethink.co.uk>
Date: Thu, 8 Feb 2018 18:15:13 +0000
Subject: Fix bugs and style issues with pylint

---
 .gitlab-ci.yml           | 3 ---
 buildstream/_pipeline.py | 2 +-
 2 files changed, 1 insertion(+), 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)
 
-- 
cgit v1.2.1