From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 23 Nov 2023 20:22:33 +0000 (+0900)
Subject: analyze: do not prepend the current working directory to SYSTEMD_UNIT_PATH needlessly
X-Git-Tag: v255-rc4~59^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F30172%2Fhead;p=thirdparty%2Fsystemd.git

analyze: do not prepend the current working directory to SYSTEMD_UNIT_PATH needlessly

If the requested unit is not in the current working directory, it is not
necessary to include the current working directory in SYSTEMD_UNIT_PATH.

Follow-up for 45519d13a4f2a3c3585e672595762ca621abe65e.

Fixes #30166.
---

diff --git a/src/analyze/analyze-verify-util.c b/src/analyze/analyze-verify-util.c
index cfafbd4d44d..f3ce0ad1f17 100644
--- a/src/analyze/analyze-verify-util.c
+++ b/src/analyze/analyze-verify-util.c
@@ -86,6 +86,9 @@ int verify_set_unit_path(char **filenames) {
                 if (r < 0)
                         return r;
 
+                if (access(a, F_OK) < 0)
+                        continue;
+
                 r = path_extract_directory(a, &t);
                 if (r < 0)
                         return r;
@@ -99,6 +102,9 @@ int verify_set_unit_path(char **filenames) {
         if (!joined)
                 return -ENOMEM;
 
+        if (isempty(joined))
+                return 0;
+
         /* First, prepend our directories. Second, if some path was specified, use that, and
          * otherwise use the defaults. Any duplicates will be filtered out in path-lookup.c.
          * Treat explicit empty path to mean that nothing should be appended. */