summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Maat <tristan.maat@codethink.com>2017-07-17 11:24:58 +0100
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-07-17 23:03:00 +0900
commitb19607e7b3ed4cfcdc6f6f839a90df65f84a674d (patch)
tree6b1eb89b9e3ef066aca37edd769fd490b0ad0e02
parent37ed5511f10fa0ec322846bdcda9e7231c4aac43 (diff)
downloadbuildstream-b19607e7b3ed4cfcdc6f6f839a90df65f84a674d.tar.gz
_pipeline.py: Reset workspace after deleting
-rw-r--r--buildstream/_pipeline.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/buildstream/_pipeline.py b/buildstream/_pipeline.py
index 91a7306b1..7df02586d 100644
--- a/buildstream/_pipeline.py
+++ b/buildstream/_pipeline.py
@@ -578,6 +578,10 @@ class Pipeline():
# Update workspace config
self.project._save_workspace_config()
+ # Reset source to avoid checking out the (now empty) workspace
+ source = list(self.target.sources())[source_index]
+ source._del_workspace()
+
# reset_workspace
#
# Reset a workspace to its original state, discarding any user
@@ -599,10 +603,6 @@ class Pipeline():
self.close_workspace(source_index, True)
- # Reset source to avoid checking out the (now empty) workspace
- source = list(self.target.sources())[source_index]
- source._del_workspace()
-
self.open_workspace(scheduler, workspace_dir, source_index, no_checkout,
track, False)