[systemd-commits] 2 commits - src/dbus.c src/systemctl.c

[Lennart Poettering]

 src/dbus.c      |    2 +-
 src/systemctl.c |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 35df8f27fae82c6f9e83d750ffa5e54733b16cf2
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Sep 6 02:42:49 2010 +0200

    systemctl: implement --version
    
    https://bugs.freedesktop.org/show_bug.cgi?id=29912

diff --git a/src/systemctl.c b/src/systemctl.c
index ecf3e01..c77f831 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -3845,6 +3845,7 @@ static int systemctl_help(void) {
         printf("%s [OPTIONS...] {COMMAND} ...\n\n"
                "Send control commands to or query the systemd manager.\n\n"
                "  -h --help          Show this help\n"
+               "     --version       Show package version\n"
                "  -t --type=TYPE     List only units of a particular type\n"
                "  -p --property=NAME Show only properties by this name\n"
                "  -a --all           Show all units/properties, including dead/empty ones\n"
@@ -3979,6 +3980,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
 
         enum {
                 ARG_FAIL = 0x100,
+                ARG_VERSION,
                 ARG_SESSION,
                 ARG_SYSTEM,
                 ARG_GLOBAL,
@@ -3994,6 +3996,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
 
         static const struct option options[] = {
                 { "help",      no_argument,       NULL, 'h'           },
+                { "version",   no_argument,       NULL, ARG_VERSION   },
                 { "type",      required_argument, NULL, 't'           },
                 { "property",  required_argument, NULL, 'p'           },
                 { "all",       no_argument,       NULL, 'a'           },
@@ -4026,6 +4029,10 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         systemctl_help();
                         return 0;
 
+                case ARG_VERSION:
+                        puts(PACKAGE_STRING);
+                        return 0;
+
                 case 't':
                         arg_type = optarg;
                         break;
commit 2a8cd298f48d4664601d8b51132e0a5d41da25f3
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Sep 6 02:42:42 2010 +0200

    dbus: downgrade activation failure messages

diff --git a/src/dbus.c b/src/dbus.c
index 8528432..4365bca 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -401,7 +401,7 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBus
                         if (r < 0) {
                                 const char *id, *text;
 
-                                log_warning("D-Bus activation failed for %s: %s", name, strerror(-r));
+                                log_debug("D-Bus activation failed for %s: %s", name, strerror(-r));
 
                                 if (!(reply = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1.Activator", "ActivationFailure")))
                                         goto oom;