[buildstream] branch tristan/workspace-data-namespacing created (now 0d7b597)

[tv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tvb pushed a change to branch tristan/workspace-data-namespacing
in repository https://gitbox.apache.org/repos/asf/buildstream.git.


      at 0d7b597  _workspaces.py: Use bst2 specific data directory for private project state

This branch includes the following new commits:

     new 0d7b597  _workspaces.py: Use bst2 specific data directory for private project state

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[buildstream] 01/01: _workspaces.py: Use bst2 specific data directory for private project state

[tv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tvb pushed a commit to branch tristan/workspace-data-namespacing
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 0d7b59738c2264f6da1329ac9a07133161869d3e
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Thu Sep 9 15:50:32 2021 +0900

    _workspaces.py: Use bst2 specific data directory for private project state
    
    This ensures that bst-1 and bst-2 do not step on eachothers toes when working
    on the same directory, which can typically happen when a project is in
    transition to bst-2, and a user needs to work on multiple branches.
    
    When transitioning to bst2, workspaces which appear to be open in bst1 are
    ignored by bst2, and workspaces opened with bst2 are ignored by bst1, however
    both can be configured to use the same directory for a given workspace if
    the user requires this.
    
    Fixes #1266
---
 src/buildstream/_workspaces.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/buildstream/_workspaces.py b/src/buildstream/_workspaces.py
index ebca148..28859be 100644
--- a/src/buildstream/_workspaces.py
+++ b/src/buildstream/_workspaces.py
@@ -317,7 +317,7 @@ class Workspaces:
 
         # A project without a directory can happen
         if toplevel_project.directory:
-            self._bst_directory = os.path.join(toplevel_project.directory, ".bst")
+            self._bst_directory = os.path.join(toplevel_project.directory, ".bst2")
             self._workspaces = self._load_config()
         else:
             self._bst_directory = None