summaryrefslogtreecommitdiff
path: root/src/core/job.c
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-26 16:33:43 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-11-26 16:33:43 +0100
commit7e803f5ecf689216d6fcd8a1d19a442f234bf28b (patch)
treeac66752758d443c1b73ae3b638d00858fd5fa8a7 /src/core/job.c
parent06c1c4f98c0d0b4c93e58d75ed5a08d722ec4de3 (diff)
core: fix assertion failure in checking a transaction with a JOB_NOP
Several functions called from transaction_activate() need to correctly handle the case where a JOB_NOP job is being checked against a unit's pending job. The assumption that JOB_NOP never merges with other job types was correct, but since the job_type_is_*() functions are implemented using the merge lookup, they need to special-case JOB_NOP to avoid hitting assertion failures.
Diffstat (limited to 'src/core/job.c')
-rw-r--r--src/core/job.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/job.c b/src/core/job.c
index 51d15811b5..1411603e0b 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -352,6 +352,9 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) {
return
b == UNIT_ACTIVATING;
+ case JOB_NOP:
+ return true;
+
default:
assert_not_reached("Invalid job type");
}