summaryrefslogtreecommitdiff
path: root/src/analyze
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-12 19:52:31 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-12 19:54:07 +0100
commit4bd29fe5cec9d744a4e39240c76b85d999bd2cf7 (patch)
tree57553ae6fc7fcfacdc08fd3daa8d7c77c48a5363 /src/analyze
parentf32b43bda454a70ae23d6802605d41b26dc24ce2 (diff)
core: drop "override" flag when building transactions
Now that we don't have RequiresOverridable= and RequisiteOverridable= dependencies anymore, we can get rid of tracking the "override" boolean for jobs in the job engine, as it serves no purpose anymore. While we are at it, fix some error messages we print when invoking functions that take the override parameter.
Diffstat (limited to 'src/analyze')
-rw-r--r--src/analyze/analyze-verify.c8
1 files changed, 3 insertions, 5 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)