[systemd-commits] src/systemctl.c

[Michal Schmidt]

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

New commits:
commit ab5919fa1af147c2632fdae7bed4504c898a60af
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Thu Feb 9 10:05:15 2012 +0100

    systemctl: check for no more work after chkconfig
    
    Avoid a bogus message from 'systemctl enable ...' when all units given
    are SysV services:
       Warning: unit files do not carry install information. No operation
       executed.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=787407

diff --git a/src/systemctl.c b/src/systemctl.c
index 12264f8..ab6d126 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -3662,12 +3662,15 @@ static int enable_unit(DBusConnection *bus, char **args) {
         int r;
         DBusError error;
 
-        dbus_error_init(&error);
-
         r = enable_sysv_units(args);
         if (r < 0)
                 return r;
 
+        if (!args[1])
+                return 0;
+
+        dbus_error_init(&error);
+
         if (!bus || avoid_bus()) {
                 if (streq(verb, "enable")) {
                         r = unit_file_enable(arg_scope, arg_runtime, arg_root, args+1, arg_force, &changes, &n_changes);