_context.py: Support parallel installations of BuildStream

Allow users to keep separate buildstream.conf files in their
XDG_CONFIG_HOME for separate BuildStream versions, in case they
have BuildStream 1 and 2 installed.

1 files changed, 9 insertions, 4 deletions

diff --git a/buildstream/_context.py b/buildstream/_context.py
index 8a7cec70c..f36bfd343 100644
--- a/buildstream/_context.py
+++ b/buildstream/_context.py
@@ -147,10 +147,15 @@ class Context():
         # a $XDG_CONFIG_HOME/buildstream.conf file
         #
         if not config:
-            default_config = os.path.join(os.environ['XDG_CONFIG_HOME'],
-                                          'buildstream.conf')
-            if os.path.exists(default_config):
-                config = default_config
+            #
+            # Support parallel installations of BuildStream by first
+            # trying buildstream1.conf and then falling back to buildstream.conf.
+            #
+            for config_filename in ("buildstream1.conf", "buildstream.conf"):
+                default_config = os.path.join(os.environ["XDG_CONFIG_HOME"], config_filename)
+                if os.path.exists(default_config):
+                    config = default_config
+                    break
 
         # Load default config
         #