From 8901b40502670d1d153f92294ae93245f608adc8 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 13 Nov 2015 14:30:07 +0100 Subject: analyze: show Requisite dependencies in the dot graph again We lost them a long time ago with commit 048ecf5b843. --- src/analyze/analyze.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index b7e45dcfd6..1fc7c9581b 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -1066,14 +1066,17 @@ static int graph_one(sd_bus *bus, const UnitInfo *u, char *patterns[], char *fro assert(bus); assert(u); - if (arg_dot == DEP_ORDER ||arg_dot == DEP_ALL) { + if (IN_SET(arg_dot, DEP_ORDER, DEP_ALL)) { r = graph_one_property(bus, u, "After", "green", patterns, from_patterns, to_patterns); if (r < 0) return r; } - if (arg_dot == DEP_REQUIRE ||arg_dot == DEP_ALL) { + if (IN_SET(arg_dot, DEP_REQUIRE, DEP_ALL)) { r = graph_one_property(bus, u, "Requires", "black", patterns, from_patterns, to_patterns); + if (r < 0) + return r; + r = graph_one_property(bus, u, "Requisite", "darkblue", patterns, from_patterns, to_patterns); if (r < 0) return r; r = graph_one_property(bus, u, "Wants", "grey66", patterns, from_patterns, to_patterns); -- cgit v1.2.3-54-g00ecf From fa4b687b63d229c7711c146896b0faa116284ede Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 13 Nov 2015 14:52:33 +0100 Subject: analyze: do not draw ConflictedBy dependencies in dot graph We already draw Conflicts. I see no reason for having every red line in the graph duplicated in the opposite direction. --- src/analyze/analyze.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 1fc7c9581b..e922d6fb32 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -1085,9 +1085,6 @@ static int graph_one(sd_bus *bus, const UnitInfo *u, char *patterns[], char *fro r = graph_one_property(bus, u, "Conflicts", "red", patterns, from_patterns, to_patterns); if (r < 0) return r; - r = graph_one_property(bus, u, "ConflictedBy", "red", patterns, from_patterns, to_patterns); - if (r < 0) - return r; } return 0; -- cgit v1.2.3-54-g00ecf