From ac97053618387ca1fa0d378cde7957aab8f0476c Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Sat, 23 Mar 2024 00:35:09 +0800 Subject: [PATCH] analyze: refuse --global dot/verify I don't quite understand the rationale of making these verbs work with --global back in the day. But realistically they interact with/spawn manager, while there's no --global runtime scope manager. And to verify/inspect user units it's sufficient to just use --user. Fixes #31911 --- src/analyze/analyze.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index b449e538f3..cf4894a9d3 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -572,10 +572,9 @@ static int parse_argv(int argc, char *argv[]) { return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Option --threshold= is only supported for security right now."); - if (arg_runtime_scope == RUNTIME_SCOPE_GLOBAL && - !STR_IN_SET(argv[optind] ?: "time", "dot", "unit-paths", "verify")) + if (arg_runtime_scope == RUNTIME_SCOPE_GLOBAL && !streq_ptr(argv[optind], "unit-paths")) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), - "Option --global only makes sense with verbs dot, unit-paths, verify."); + "Option --global only makes sense with verb unit-paths."); if (streq_ptr(argv[optind], "cat-config") && arg_runtime_scope == RUNTIME_SCOPE_USER) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), -- 2.25.1