SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: drop now-redundant special-casing of JOB_NOP

Browse Source 
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.
This commit is contained in:
Michal Schmidt
2014-11-26 16:33:45 +01:00
parent 7e803f5ecf
commit 61da906a74
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/job.c
+2 -2
View File
@@ -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,