From bd113a12517c9f3fc8af0a7d8d96e22ab5a4115a Mon Sep 17 00:00:00 2001 From: Phillip Smyth Date: Mon, 26 Mar 2018 15:38:26 +0000 Subject: Original commit required additional functionality to test resolves issue #311 https://gitlab.com/BuildStream/buildstream/issues/311 "Opening a workspace with a cached build" * app.py: modified Open_workspace to allow use of cached build tree * cli.py: added additional flag to workspace open * element.py: Added function to return cached build tree dir --- buildstream/_frontend/app.py | 1 - buildstream/_frontend/cli.py | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/buildstream/_frontend/app.py b/buildstream/_frontend/app.py index 8a1400825..05be5f75a 100644 --- a/buildstream/_frontend/app.py +++ b/buildstream/_frontend/app.py @@ -492,7 +492,6 @@ class App(): self.close_workspace(target.name, True) self.open_workspace(target, workspace.path, False, track, False, no_cache) ->>>>>>> Original commit required additional functionality to test ############################################################ # Local Functions # diff --git a/buildstream/_frontend/cli.py b/buildstream/_frontend/cli.py index 1d9cafc23..d2b86c910 100644 --- a/buildstream/_frontend/cli.py +++ b/buildstream/_frontend/cli.py @@ -690,7 +690,13 @@ def workspace_reset(app, track_, all_, elements, no_cache): if all_: elements = tuple(element_name for element_name, _ in app.project.workspaces.list()) +<<<<<<< HEAD app.stream.workspace_reset(elements, track_first=track_, no_cache) +======= + with app.initialized(elements): + for target in app.pipeline.targets: + app.reset_workspace(target, track_, no_cache) +>>>>>>> Original commit required additional functionality to test ################################################################## -- cgit v1.2.1