From 2e3bb01d79b7e3f10d603d11170d8cac45562209 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 18 Apr 2022 22:46:52 +0200 Subject: core: drop unused BUS_UNIT_QUEUE_RETURN_SKIP_ON_CONDITION_FAIL flag We'll refactor and implement the feature in a different way --- src/core/job.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/job.c') diff --git a/src/core/job.c b/src/core/job.c index 36d6f0a456..6653dbde84 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -889,8 +889,8 @@ int job_run_and_invalidate(Job *j) { job_set_state(j, JOB_WAITING); /* Hmm, not ready after all, let's return to JOB_WAITING state */ else if (r == -EALREADY) /* already being executed */ r = job_finish_and_invalidate(j, JOB_DONE, true, true); - else if (r == -ECOMM) /* condition failed, but all is good. Return 'skip' if caller requested it. */ - r = job_finish_and_invalidate(j, j->return_skip_on_cond_failure ? JOB_SKIPPED : JOB_DONE, true, false); + else if (r == -ECOMM) + r = job_finish_and_invalidate(j, JOB_DONE, true, false); else if (r == -EBADR) r = job_finish_and_invalidate(j, JOB_SKIPPED, true, false); else if (r == -ENOEXEC) -- cgit v1.2.1