summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-26 16:33:45 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-11-26 16:33:45 +0100
commit61da906a744594002c2c967ecf6ec7899c7a9397 (patch)
tree353e39eba405025d8d573da3e57afcf8c006c842 /src
parent7e803f5ecf689216d6fcd8a1d19a442f234bf28b (diff)
core: drop now-redundant special-casing of JOB_NOP
job_type_is_conflicting(X, JOB_NOP) correctly gives: false. job_type_allows_late_merge(JOB_NOP) && job_type_is_superset(X, JOB_NOP) correctly gives: true.
Diffstat (limited to 'src')
-rw-r--r--src/core/job.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/job.c b/src/core/job.c
index 1411603e0b..9adc3fda6a 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -160,12 +160,12 @@ Job* job_install(Job *j) {
uj = *pj;
if (uj) {
- if (j->type != JOB_NOP && job_type_is_conflicting(uj->type, j->type))
+ if (job_type_is_conflicting(uj->type, j->type))
job_finish_and_invalidate(uj, JOB_CANCELED, false);
else {
/* not conflicting, i.e. mergeable */
- if (j->type == JOB_NOP || uj->state == JOB_WAITING ||
+ if (uj->state == JOB_WAITING ||
(job_type_allows_late_merge(j->type) && job_type_is_superset(uj->type, j->type))) {
job_merge_into_installed(uj, j);
log_debug_unit(uj->unit->id,