From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 17 Oct 2016 01:27:57 +0000 (-0400)
Subject: shared/install: provide more info if install_info_traverse_fails
X-Git-Tag: v232~78^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db093eed04cf88aa75c58cb7a69d55d669af0e34;p=thirdparty%2Fsystemd.git

shared/install: provide more info if install_info_traverse_fails

Test case:
[Install]
WantedBy= default.target
Also=foobar-unknown.service

Before:
$ systemctl --root=/ enable testing2@instance.service
Failed to enable: No such file or directory.

After
$ ./systemctl --root=/ enable testing2@instance.service
Failed to enable unit, file foobar-unknown.service: No such file or directory.
---

diff --git a/src/shared/install.c b/src/shared/install.c
index 9e26284ade7..32f7edc8cc8 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1713,8 +1713,10 @@ static int install_context_apply(
                         return q;
 
                 r = install_info_traverse(scope, c, paths, i, flags, NULL);
-                if (r < 0)
+                if (r < 0) {
+                        unit_file_changes_add(changes, n_changes, r, i->name, NULL);
                         return r;
+                }
 
                 /* We can attempt to process a masked unit when a different unit
                  * that we were processing specifies it in Also=. */