diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2015-11-13 14:04:34 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2015-11-13 14:04:34 +0100 |
| commit | 7152869f0a4a4612022244064cc2b3905b1e3fc7 (patch) | |
| tree | 214d990bcdb433a1ad231db67d8502e6258e6702 /src/analyze | |
| parent | 28c85daf0ae80d1d5f8b878efa4bdad690e1f29b (diff) | |
| parent | 06ce859b5856eacee61a3f47c63c173a4e38c505 (diff) | |
Merge pull request #1869 from poettering/kill-overridable
Remove support for RequiresOverridable= and RequisiteOverridable=
Diffstat (limited to 'src/analyze')
| -rw-r--r-- | src/analyze/analyze-verify.c | 8 | ||||
| -rw-r--r-- | src/analyze/analyze.c | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c index a377996a37..deb102c22c 100644 --- a/src/analyze/analyze-verify.c +++ b/src/analyze/analyze-verify.c @@ -23,6 +23,7 @@ #include "alloc-util.h" #include "analyze-verify.h" +#include "bus-error.h" #include "bus-util.h" #include "log.h" #include "manager.h" @@ -164,7 +165,6 @@ static int verify_documentation(Unit *u, bool check_man) { static int verify_unit(Unit *u, bool check_man) { _cleanup_bus_error_free_ sd_bus_error err = SD_BUS_ERROR_NULL; - Job *j; int r, k; assert(u); @@ -173,11 +173,9 @@ static int verify_unit(Unit *u, bool check_man) { unit_dump(u, stdout, "\t"); log_unit_debug(u, "Creating %s/start job", u->id); - r = manager_add_job(u->manager, JOB_START, u, JOB_REPLACE, false, &err, &j); - if (sd_bus_error_is_set(&err)) - log_unit_error(u, "Error: %s: %s", err.name, err.message); + r = manager_add_job(u->manager, JOB_START, u, JOB_REPLACE, &err, NULL); if (r < 0) - log_unit_error_errno(u, r, "Failed to create %s/start: %m", u->id); + log_unit_error_errno(u, r, "Failed to create %s/start: %s", u->id, bus_error_message(&err, r)); k = verify_socket(u); if (k < 0 && r == 0) diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 27ead903e9..b7e45dcfd6 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -1076,12 +1076,6 @@ static int graph_one(sd_bus *bus, const UnitInfo *u, char *patterns[], char *fro r = graph_one_property(bus, u, "Requires", "black", patterns, from_patterns, to_patterns); if (r < 0) return r; - r = graph_one_property(bus, u, "RequiresOverridable", "black", patterns, from_patterns, to_patterns); - if (r < 0) - return r; - r = graph_one_property(bus, u, "RequisiteOverridable", "darkblue", patterns, from_patterns, to_patterns); - if (r < 0) - return r; r = graph_one_property(bus, u, "Wants", "grey66", patterns, from_patterns, to_patterns); if (r < 0) return r; |