X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fpython-lttngust%2Flttngust%2Fagent.py;h=b99293424aac705728c13c47716b5b9f516951ab;hb=90d125c709f566f3663bf84677f100134cc618e0;hp=66dbbd5e2b5efc00f5cc8b263f2f1aeffc29f94f;hpb=a34c2ec061dd1aee434ad6c0a0a1d78876010d47;p=lttng-ust.git

diff --git a/src/python-lttngust/lttngust/agent.py b/src/python-lttngust/lttngust/agent.py
index 66dbbd5e..b9929342 100644
--- a/src/python-lttngust/lttngust/agent.py
+++ b/src/python-lttngust/lttngust/agent.py
@@ -268,8 +268,10 @@ def _get_port_from_file(path):
 
 
 def _get_user_home_path():
-    # $LTTNG_HOME overrides $HOME if it exists
-    return os.getenv('LTTNG_HOME', os.path.expanduser('~'))
+    # $LTTNG_UST_HOME overrides $LTTNG_HOME if it exist.
+    # In turn, $LTTNG_HOME overrides $HOME if it exists
+    return os.getenv('LTTNG_UST_HOME', os.getenv('LTTNG_HOME',
+        os.path.expanduser('~')))
 
 
 _initialized = False