diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-21 19:02:50 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-21 19:02:50 -0400 |
| commit | f3bbbbc700b285242fde052a19c576389f830fef (patch) | |
| tree | d65b6a3a7606af5a05a2b52ad91c3e10d5174fd5 /src/systemctl/systemctl.c | |
| parent | 17b593aacd4e8d056f2be860a7b744004892ecbd (diff) | |
| parent | 5d4922bba91c6d60b3b9f38fb29fda0f6ba8338d (diff) | |
Merge branch 'systemd/parabola' into notsystemd/premove
Diffstat (limited to 'src/systemctl/systemctl.c')
| -rw-r--r-- | src/systemctl/systemctl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 6a0ed79a53..114c4f1703 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4685,12 +4685,14 @@ static int show_one( return log_error_errno(r, "Failed to map properties: %s", bus_error_message(&error, r)); if (streq_ptr(info.load_state, "not-found") && streq_ptr(info.active_state, "inactive")) { - log_error("Unit %s could not be found.", unit); + log_full(streq(verb, "status") ? LOG_ERR : LOG_DEBUG, + "Unit %s could not be found.", unit); if (streq(verb, "status")) return EXIT_PROGRAM_OR_SERVICES_STATUS_UNKNOWN; - return -ENOENT; + if (!streq(verb, "show")) + return -ENOENT; } r = sd_bus_message_rewind(reply, true); @@ -4755,10 +4757,11 @@ static int show_one( r = 0; if (show_properties) { char **pp; + int not_found_level = streq(verb, "show") ? LOG_DEBUG : LOG_WARNING; STRV_FOREACH(pp, arg_properties) if (!set_contains(found_properties, *pp)) { - log_warning("Property %s does not exist.", *pp); + log_full(not_found_level, "Property %s does not exist.", *pp); r = -ENXIO; } |