From 80931b4f6b4ba8fe5a828c907b75796cc197a1ff Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 13 Sep 2016 17:17:50 -0400
Subject: [PATCH] Fix: do not overwrite ret if already set and session found
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Errors were not propagated correctly otherwise.

e.g:
	(No sessiond running)
	lttng load --all
	-> All sessions have been loaded successfully
	lttng list show no sessions

With fix the same command output:
	Error: No session daemon is available

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 src/common/config/session-config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index 6c639af44..503f49fad 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -2842,7 +2842,7 @@ end:
 		}
 	}
 
-	if (session_found) {
+	if (session_found && !ret) {
 		ret = 0;
 	}
 
-- 
2.34.1