[systemd-commits] src/systemctl.c

[Lennart Poettering]

 src/systemctl.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f176b5c296ad36119aa2464f9fd738e6da59eeee
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Sep 29 16:00:29 2011 +0200

    systemctl: fix error message when no connection to systemd is available

diff --git a/src/systemctl.c b/src/systemctl.c
index 7af0f73..9b54da1 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -4990,14 +4990,16 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError
                 }
 
                 if (!bus) {
-                        log_error("Failed to get D-Bus connection: %s", error->message);
+                        log_error("Failed to get D-Bus connection: %s",
+                                  dbus_error_is_set(error) ? error->message : "No connection to service manager.");
                         return -EIO;
                 }
 
         } else {
 
                 if (!bus && !avoid_bus()) {
-                        log_error("Failed to get D-Bus connection: %s", error->message);
+                        log_error("Failed to get D-Bus connection: %s",
+                                  dbus_error_is_set(error) ? error->message : "No connection to service manager.");
                         return -EIO;
                 }
         }