From a3de0e1ff79b45fd87fd79cf570258cdfe966af1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 10 Sep 2018 12:33:36 +1000
Subject: [PATCH] ratbagd: provide a decent error message when the bus name is
 taken

sd-bus returns EEXISTS which is "File exists" and way too confusing. Let's
print out a decent error message for that case.

Relater #535
---
 ratbagd/ratbagd.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ratbagd/ratbagd.c b/ratbagd/ratbagd.c
index 6eb556c3..1e4815d4 100644
--- a/ratbagd/ratbagd.c
+++ b/ratbagd/ratbagd.c
@@ -568,8 +568,12 @@ exit:
 	ratbagd_free(ctx);
 
 	if (r < 0) {
-		errno = -r;
-		log_error("Failed to start ratbagd: %m\n");
+		if (r == -EEXIST) {
+			log_error("Bus name is taken, another instance of ratbagd is already running.\n");
+		} else {
+			errno = -r;
+			log_error("Failed to start ratbagd: %m\n");
+		}
 		return EXIT_FAILURE;
 	}