From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 20 Jan 2014 12:43:20 +0000 (+0100)
Subject: systemctl: skip native unit file handling if sysv file handling already handled every... 
X-Git-Tag: v209~388
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=67d6621059085963a2a908a3ea99ced3b0ca789e;p=elogind.git

systemctl: skip native unit file handling if sysv file handling already handled everything

Issue pointed out by Colin Guthrie.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index b9d9b3aa9..d850b8bdf 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4740,6 +4740,11 @@ static int enable_unit(sd_bus *bus, char **args) {
         if (r < 0)
                 return r;
 
+        /* If the operation was fully executed by the SysV compat,
+         * let's finish early */
+        if (strv_isempty(names))
+                return 0;
+
         if (!bus || avoid_bus()) {
                 if (streq(verb, "enable")) {
                         r = unit_file_enable(arg_scope, arg_runtime, arg_root, names, arg_force, &changes, &n_changes);